From 80337cb88481c636d136e3db2330e7d5a9759f2d Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Wed, 29 Nov 2023 18:53:44 -0800
Subject: [PATCH] Automated rollback of commit
 30b6251dea7a0ff1713a97d7e7d29a48e4880f59.

PiperOrigin-RevId: 586513152
---
 .../main/java/com/google/protobuf/GeneratedMessageV3.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
index 9c4980fcbe..0a5bfda6bb 100644
--- a/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
+++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
@@ -2459,11 +2459,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
           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,