diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index b80adb3e43..7bb9686d2c 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -339,9 +339,9 @@ Api::~Api() {
 
 inline void Api::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_methods()->~RepeatedPtrField();
-  _internal_mutable_options()->~RepeatedPtrField();
-  _internal_mutable_mixins()->~RepeatedPtrField();
+  _impl_.methods_.~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
+  _impl_.mixins_.~RepeatedPtrField();
   _impl_.name_.Destroy();
   _impl_.version_.Destroy();
   if (this != internal_default_instance()) delete _impl_.source_context_;
@@ -788,7 +788,7 @@ Method::~Method() {
 
 inline void Method::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_options()->~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
   _impl_.name_.Destroy();
   _impl_.request_type_url_.Destroy();
   _impl_.response_type_url_.Destroy();
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index 1521e0ad71..af2b385972 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -904,7 +904,7 @@ ListValue::~ListValue() {
 
 inline void ListValue::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_values()->~RepeatedPtrField();
+  _impl_.values_.~RepeatedPtrField();
 }
 
 void ListValue::SetCachedSize(int size) const {
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
index e3b3f6b20a..b2ba9a4bc5 100644
--- a/src/google/protobuf/type.pb.cc
+++ b/src/google/protobuf/type.pb.cc
@@ -551,9 +551,9 @@ Type::~Type() {
 
 inline void Type::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_fields()->~RepeatedPtrField();
+  _impl_.fields_.~RepeatedPtrField();
   _internal_mutable_oneofs()->~RepeatedPtrField();
-  _internal_mutable_options()->~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
   _impl_.name_.Destroy();
   _impl_.edition_.Destroy();
   if (this != internal_default_instance()) delete _impl_.source_context_;
@@ -1023,7 +1023,7 @@ Field::~Field() {
 
 inline void Field::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_options()->~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
   _impl_.name_.Destroy();
   _impl_.type_url_.Destroy();
   _impl_.json_name_.Destroy();
@@ -1528,8 +1528,8 @@ Enum::~Enum() {
 
 inline void Enum::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_enumvalue()->~RepeatedPtrField();
-  _internal_mutable_options()->~RepeatedPtrField();
+  _impl_.enumvalue_.~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
   _impl_.name_.Destroy();
   _impl_.edition_.Destroy();
   if (this != internal_default_instance()) delete _impl_.source_context_;
@@ -1901,7 +1901,7 @@ EnumValue::~EnumValue() {
 
 inline void EnumValue::SharedDtor() {
   ABSL_DCHECK(GetArenaForAllocation() == nullptr);
-  _internal_mutable_options()->~RepeatedPtrField();
+  _impl_.options_.~RepeatedPtrField();
   _impl_.name_.Destroy();
 }