Automated rollback of commit 30b6251.

PiperOrigin-RevId: 586513152

Author: zhangskz

java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java

@@ -2459,11 +2459,7 @@ public void clear(final GeneratedMessageV3.Builder<?> builder) {
           final String containingOneofCamelCaseName) {
         isOneofField =
             descriptor.getRealContainingOneof() != null;
-        hasHasMethod =
-            descriptor.getFile().getSyntax() == FileDescriptor.Syntax.EDITIONS && descriptor.hasPresence()
-                || descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
-                || descriptor.hasOptionalKeyword()
-                || (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
+        hasHasMethod = descriptor.hasPresence();
         ReflectionInvoker reflectionInvoker =
             new ReflectionInvoker(
                 descriptor,