diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
index 426adb61bf..aeeeb94e3d 100644
--- a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
+++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
@@ -1094,7 +1094,14 @@ public abstract class GeneratedMessage extends AbstractMessage implements Serial
       }
     }
 
-    // TODO: Remove, replace with newExtensionSerializer().
+    /**
+     * For compatibility with older gencode.
+     *
+     * <p> TODO Remove this in the next breaking release.
+     *
+     * @deprecated Use {@link newExtensionSerializer()} instead.
+     */
+    @Deprecated
     protected ExtensionWriter newExtensionWriter() {
       return new ExtensionWriter(false);
     }