diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
index c426679dc0..e8f88a62b3 100644
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
@@ -2914,27 +2914,6 @@ UPB_API_INLINE void upb_Message_ClearExtension(
   }
 }
 
-UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
-    const struct upb_Message* message, const upb_MiniTableField* oneof_field) {
-  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
-  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
-}
-
-UPB_API_INLINE void upb_Message_ClearOneof(struct upb_Message* msg,
-                                           const upb_MiniTable* m,
-                                           const upb_MiniTableField* f) {
-  UPB_ASSERT(!upb_Message_IsFrozen(msg));
-  uint32_t field_number = upb_Message_WhichOneofFieldNumber(msg, f);
-  if (field_number == 0) {
-    // No field in the oneof is set.
-    return;
-  }
-
-  const upb_MiniTableField* field =
-      upb_MiniTable_FindFieldByNumber(m, field_number);
-  upb_Message_ClearBaseField(msg, field);
-}
-
 UPB_INLINE void _upb_Message_AssertMapIsUntagged(
     const struct upb_Message* msg, const upb_MiniTableField* field) {
   UPB_UNUSED(msg);
@@ -3246,9 +3225,11 @@ UPB_API_INLINE bool upb_Message_SetExtension(upb_Message* msg,
                                              const upb_MiniTableExtension* e,
                                              const void* val, upb_Arena* a);
 
-UPB_API_INLINE void upb_Message_ClearOneof(upb_Message* msg,
-                                           const upb_MiniTable* m,
-                                           const upb_MiniTableField* f);
+UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
+    const upb_Message* message, const upb_MiniTableField* oneof_field) {
+  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
+  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
+}
 
 // NOTE: The default_val is only used for fields that support presence.
 // For repeated/map fields, the resulting upb_Array*/upb_Map* can be NULL if a
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index 028e076eb4..eebfde85aa 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -2916,27 +2916,6 @@ UPB_API_INLINE void upb_Message_ClearExtension(
   }
 }
 
-UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
-    const struct upb_Message* message, const upb_MiniTableField* oneof_field) {
-  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
-  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
-}
-
-UPB_API_INLINE void upb_Message_ClearOneof(struct upb_Message* msg,
-                                           const upb_MiniTable* m,
-                                           const upb_MiniTableField* f) {
-  UPB_ASSERT(!upb_Message_IsFrozen(msg));
-  uint32_t field_number = upb_Message_WhichOneofFieldNumber(msg, f);
-  if (field_number == 0) {
-    // No field in the oneof is set.
-    return;
-  }
-
-  const upb_MiniTableField* field =
-      upb_MiniTable_FindFieldByNumber(m, field_number);
-  upb_Message_ClearBaseField(msg, field);
-}
-
 UPB_INLINE void _upb_Message_AssertMapIsUntagged(
     const struct upb_Message* msg, const upb_MiniTableField* field) {
   UPB_UNUSED(msg);
@@ -3248,9 +3227,11 @@ UPB_API_INLINE bool upb_Message_SetExtension(upb_Message* msg,
                                              const upb_MiniTableExtension* e,
                                              const void* val, upb_Arena* a);
 
-UPB_API_INLINE void upb_Message_ClearOneof(upb_Message* msg,
-                                           const upb_MiniTable* m,
-                                           const upb_MiniTableField* f);
+UPB_API_INLINE uint32_t upb_Message_WhichOneofFieldNumber(
+    const upb_Message* message, const upb_MiniTableField* oneof_field) {
+  UPB_ASSUME(upb_MiniTableField_IsInOneof(oneof_field));
+  return UPB_PRIVATE(_upb_Message_GetOneofCase)(message, oneof_field);
+}
 
 // NOTE: The default_val is only used for fields that support presence.
 // For repeated/map fields, the resulting upb_Array*/upb_Map* can be NULL if a