diff --git a/ruby/ext/google/protobuf_c/message.c b/ruby/ext/google/protobuf_c/message.c
index 9dc6f171f4b9..fecde28786ef 100644
--- a/ruby/ext/google/protobuf_c/message.c
+++ b/ruby/ext/google/protobuf_c/message.c
@@ -243,15 +243,6 @@ static int extract_method_call(VALUE method_name, Message* self,
   if (Match(m, name, f, o, "clear_", "")) return METHOD_CLEAR;
   if (Match(m, name, f, o, "has_", "?") &&
       (*o || (*f && upb_FieldDef_HasPresence(*f)))) {
-    // Disallow oneof hazzers for proto3.
-    // TODO(haberman): remove this test when we are enabling oneof hazzers for
-    // proto3.
-    if (*f && !upb_FieldDef_IsSubMessage(*f) &&
-        upb_FieldDef_RealContainingOneof(*f) &&
-        upb_MessageDef_Syntax(upb_FieldDef_ContainingType(*f)) !=
-            kUpb_Syntax_Proto2) {
-      return METHOD_UNKNOWN;
-    }
     return METHOD_PRESENCE;
   }
   if (Match(m, name, f, o, "", "_as_value") && *f &&
diff --git a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
index 301b95798215..92a31d6df224 100644
--- a/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ b/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
@@ -306,11 +306,7 @@ public IRubyObject respondTo(ThreadContext context, IRubyObject[] args) {
     if (methodName.startsWith(HAS_PREFIX) && methodName.endsWith(QUESTION_MARK)) {
       String strippedMethodName = methodName.substring(4, methodName.length() - 1);
       FieldDescriptor fieldDescriptor = descriptor.findFieldByName(strippedMethodName);
-      if (fieldDescriptor != null
-          && (!proto3
-              || fieldDescriptor.getContainingOneof() == null
-              || fieldDescriptor.getContainingOneof().isSynthetic())
-          && fieldDescriptor.hasPresence()) {
+      if (fieldDescriptor != null && fieldDescriptor.hasPresence()) {
         return context.runtime.getTrue();
       }
       oneofDescriptor =
@@ -459,11 +455,7 @@ public IRubyObject methodMissing(ThreadContext context, IRubyObject[] args) {
 
         fieldDescriptor = descriptor.findFieldByName(methodName);
 
-        if (fieldDescriptor != null
-            && (!proto3
-                || fieldDescriptor.getContainingOneof() == null
-                || fieldDescriptor.getContainingOneof().isSynthetic())
-            && fieldDescriptor.hasPresence()) {
+        if (fieldDescriptor != null && fieldDescriptor.hasPresence()) {
           return fields.containsKey(fieldDescriptor) ? runtime.getTrue() : runtime.getFalse();
         }
 
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index 5b781b7a692a..7351b9cd33e1 100755
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -119,11 +119,10 @@ def test_has_field
 
       m = OneofMessage.new
       assert !m.has_my_oneof?
+      assert !m.has_a?
       m.a = "foo"
       assert m.has_my_oneof?
-      assert_raise NoMethodError do
-        m.has_a?
-      end
+      assert m.has_a?
       assert_true OneofMessage.descriptor.lookup('a').has?(m)
 
       m = TestSingularFields.new
@@ -716,24 +715,16 @@ def test_map_fields_respond_to? # regression test for issue 9202
 
   def test_oneof_fields_respond_to? # regression test for issue 9202
     msg = proto_module::OneofMessage.new
-    # `has_` prefix + "?" suffix actions should only work for oneofs fields.
+    # `has_` prefix + "?" suffix actions should work for oneofs fields and members.
     assert msg.has_my_oneof?
     assert msg.respond_to? :has_my_oneof?
-    assert !msg.respond_to?( :has_a? )
-    assert_raise NoMethodError do
-      msg.has_a?
-    end
-    assert !msg.respond_to?( :has_b? )
-    assert_raise NoMethodError do
-      msg.has_b?
-    end
-    assert !msg.respond_to?( :has_c? )
-    assert_raise NoMethodError do
-      msg.has_c?
-    end
-    assert !msg.respond_to?( :has_d? )
-    assert_raise NoMethodError do
-      msg.has_d?
-    end
+    assert msg.respond_to?( :has_a? )
+    assert !msg.has_a?
+    assert msg.respond_to?( :has_b? )
+    assert !msg.has_b?
+    assert msg.respond_to?( :has_c? )
+    assert !msg.has_c?
+    assert msg.respond_to?( :has_d? )
+    assert !msg.has_d?
   end
 end