diff --git a/README.android b/README.android
index 0f7d5e1..f1e97d9 100644
--- a/README.android
+++ b/README.android
@@ -9,7 +9,6 @@
  - Initial changes include support for the micro protobuf compiler and the
    assoicated runtime.
  - https://github.com/google/protobuf/pull/2732: const FieldDescriptorCompare
- - Add NOLINT to "return *default_instance_;" in cpp_message.cc.
 
 Protocol Buffers are a way of encoding structured data in an efficient
 yet extensible format. Google uses Protocol Buffers for almost all
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc
index 130e5b2..14a9a99 100644
--- a/src/google/protobuf/compiler/cpp/cpp_message.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_message.cc
@@ -2313,7 +2313,7 @@
       GlobalAddDescriptorsName(descriptor_->file()->name()));
 
   printer->Print(
-    "  return *default_instance_; /* NOLINT */\n"
+    "  return *default_instance_;\n"
     "}\n"
     "\n"
     "$classname$* $classname$::default_instance_ = NULL;\n"