diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
index 2e19d332623b..f264b13abde8 100644
--- a/google/protobuf/descriptor.proto
+++ b/google/protobuf/descriptor.proto
@@ -502,6 +502,10 @@ message MessageOptions {
 
   reserved 4, 5, 6;
 
+  // NOTE: Do not set the option in .proto files. Always use the maps syntax
+  // instead. The option should only be implicitly set by the proto compiler
+  // parser.
+  //
   // Whether the message is an automatically generated map entry type for the
   // maps field.
   //
@@ -519,10 +523,6 @@ message MessageOptions {
   // use a native map in the target language to hold the keys and values.
   // The reflection APIs in such implementations still need to work as
   // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
   optional bool map_entry = 7;
 
   reserved 8;  // javalite_serializable