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 d3ff341dc0..f722f8852c 100644
--- a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
+++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
@@ -1613,7 +1613,7 @@ public abstract class GeneratedMessage extends AbstractMessage implements Serial
           protected FieldDescriptor loadDescriptor() {
             try {
               Class clazz = singularType.getClassLoader().loadClass(descriptorOuterClass);
-              FileDescriptor file = (FileDescriptor) clazz.getField("descriptor").get(null);
+              FileDescriptor file = (FileDescriptor) clazz.getMethod("getDescriptor").invoke(null);
               return file.findExtensionByName(extensionName);
             } catch (Exception e) {
               throw new RuntimeException(