diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 30f1888faf..58eb072c74 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1134,8 +1134,7 @@ inline void Api::set_allocated_source_context(::google::protobuf::SourceContext*
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(reinterpret_cast<::google::protobuf::MessageLite*>(value));
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index ac171b5420..59c0bae318 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -463,8 +463,7 @@ void Value::set_allocated_struct_value(::google::protobuf::Struct* struct_value)
   ::google::protobuf::Arena* message_arena = GetArena();
   clear_kind();
   if (struct_value) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(struct_value);
+    ::google::protobuf::Arena* submessage_arena = struct_value->GetArena();
     if (message_arena != submessage_arena) {
       struct_value = ::google::protobuf::internal::GetOwnedMessage(message_arena, struct_value, submessage_arena);
     }
@@ -477,8 +476,7 @@ void Value::set_allocated_list_value(::google::protobuf::ListValue* list_value)
   ::google::protobuf::Arena* message_arena = GetArena();
   clear_kind();
   if (list_value) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(list_value);
+    ::google::protobuf::Arena* submessage_arena = list_value->GetArena();
     if (message_arena != submessage_arena) {
       list_value = ::google::protobuf::internal::GetOwnedMessage(message_arena, list_value, submessage_arena);
     }
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 3ccff5dbc9..bbde59acd2 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1905,8 +1905,7 @@ inline void Type::set_allocated_source_context(::google::protobuf::SourceContext
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(reinterpret_cast<::google::protobuf::MessageLite*>(value));
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
@@ -2608,8 +2607,7 @@ inline void Enum::set_allocated_source_context(::google::protobuf::SourceContext
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(reinterpret_cast<::google::protobuf::MessageLite*>(value));
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
@@ -2962,8 +2960,7 @@ inline void Option::set_allocated_value(::google::protobuf::Any* value) {
   }
 
   if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena =
-        ::google::protobuf::Arena::InternalGetOwningArena(reinterpret_cast<::google::protobuf::MessageLite*>(value));
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
     if (message_arena != submessage_arena) {
       value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }