diff --git a/msg/templates/uorb_microcdr/msg.cpp.template b/msg/templates/uorb_microcdr/msg.cpp.template
index a08ddcb55ebbefa71b17383184d230512c495ab0..fdbdb9d2ee300f9a8f8cf3b7c0c8c7bff1de03be 100644
--- a/msg/templates/uorb_microcdr/msg.cpp.template
+++ b/msg/templates/uorb_microcdr/msg.cpp.template
@@ -131,14 +131,10 @@ def add_deserialize_functions(fields, scope_name):
                         add_deserialize_functions(children_fields, name + ('[%d].' %i))
 
 def add_code_to_serialize():
-    # sort fields (using a stable sort) as in the declaration of the type
-    sorted_fields = sorted(spec.parsed_fields(), key=sizeof_field_type, reverse=True)
-    add_serialize_functions(sorted_fields, "")
+    add_serialize_functions(spec.parsed_fields(), "")
 
 def add_code_to_deserialize():
-    # sort fields (using a stable sort) as in the declaration of the type
-    sorted_fields = sorted(spec.parsed_fields(), key=sizeof_field_type, reverse=True)
-    add_deserialize_functions(sorted_fields, "")
+    add_deserialize_functions(spec.parsed_fields(), "")
 }@
 
 void serialize_@(topic_name)(ucdrBuffer *writer, const struct @(uorb_struct) *input, char *output, uint32_t *length)
diff --git a/msg/templates/urtps/msg.idl.template b/msg/templates/urtps/msg.idl.template
index 3cfabba707f61fc10f1dbaba2a8a20d35e6b1a82..57536f362921ac67062af3b982a5737cf8294168 100644
--- a/msg/templates/urtps/msg.idl.template
+++ b/msg/templates/urtps/msg.idl.template
@@ -78,10 +78,7 @@ def add_msg_field(field):
 
 
 def add_msg_fields():
-    # sort fields (using a stable sort) as in the declaration of the type
-    sorted_fields = sorted(spec.parsed_fields(),
-                           key=sizeof_field_type, reverse=True)
-    for field in sorted_fields:
+    for field in spec.parsed_fields():
         add_msg_field(field)