diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc
index c3919c7209..b27f1b570c 100644
--- a/src/google/protobuf/struct.pb.cc
+++ b/src/google/protobuf/struct.pb.cc
@@ -570,20 +570,12 @@ void Value::clear_kind() {
     case kStructValue: {
       if (GetArena() == nullptr) {
         delete _impl_.kind_.struct_value_;
-      } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-        if (_impl_.kind_.struct_value_ != nullptr) {
-          _impl_.kind_.struct_value_->Clear();
-        }
       }
       break;
     }
     case kListValue: {
       if (GetArena() == nullptr) {
         delete _impl_.kind_.list_value_;
-      } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-        if (_impl_.kind_.list_value_ != nullptr) {
-          _impl_.kind_.list_value_->Clear();
-        }
       }
       break;
     }
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index ad1b79f8c1..2dfeeca858 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1019,10 +1019,6 @@ inline void Value::clear_struct_value() {
   if (kind_case() == kStructValue) {
     if (GetArena() == nullptr) {
       delete _impl_.kind_.struct_value_;
-    } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-      if (_impl_.kind_.struct_value_ != nullptr) {
-        _impl_.kind_.struct_value_->Clear();
-      }
     }
     clear_has_kind();
   }
@@ -1100,10 +1096,6 @@ inline void Value::clear_list_value() {
   if (kind_case() == kListValue) {
     if (GetArena() == nullptr) {
       delete _impl_.kind_.list_value_;
-    } else if (::google::protobuf::internal::DebugHardenClearOneofMessageOnArena()) {
-      if (_impl_.kind_.list_value_ != nullptr) {
-        _impl_.kind_.list_value_->Clear();
-      }
     }
     clear_has_kind();
   }