diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index 41d56d727a..6debb20167 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -280,10 +280,6 @@ class PROTOBUF_EXPORT Any final : public ::google::protobuf::Message
       1, 2, 0,
       36, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Any_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index e8e2854178..265646d8ea 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -240,10 +240,6 @@ class PROTOBUF_EXPORT Mixin final : public ::google::protobuf::Message
       1, 2, 0,
       38, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Mixin_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -502,10 +498,6 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message
       3, 7, 1,
       68, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Method_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -782,10 +774,6 @@ class PROTOBUF_EXPORT Api final : public ::google::protobuf::Message
       3, 7, 4,
       39, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Api_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index a89d4e3e5d..b0e038115d 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -220,10 +220,6 @@ class PROTOBUF_EXPORT Duration final : public ::google::protobuf::Message
       1, 2, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Duration_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index 6ed316c4cd..75112d46e6 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -181,10 +181,6 @@ class PROTOBUF_EXPORT Empty final : public ::google::protobuf::internal::ZeroFie
       0, 0, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Empty_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index f51b677e7d..4522745825 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -227,10 +227,6 @@ class PROTOBUF_EXPORT FieldMask final : public ::google::protobuf::Message
       0, 1, 0,
       39, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_FieldMask_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 04234a49a2..b8e1631bda 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -215,10 +215,6 @@ class PROTOBUF_EXPORT SourceContext final : public ::google::protobuf::Message
       0, 1, 0,
       47, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_SourceContext_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index 4dd15cb541..6e27be883f 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -261,10 +261,6 @@ class PROTOBUF_EXPORT ListValue final : public ::google::protobuf::Message
       0, 1, 1,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_ListValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -436,10 +432,6 @@ class PROTOBUF_EXPORT Struct final : public ::google::protobuf::Message
       0, 1, 2,
       37, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Struct_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -735,10 +727,6 @@ class PROTOBUF_EXPORT Value final : public ::google::protobuf::Message
       0, 6, 2,
       42, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Value_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index 370ca61a49..27cb3ab00e 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -220,10 +220,6 @@ class PROTOBUF_EXPORT Timestamp final : public ::google::protobuf::Message
       1, 2, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Timestamp_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index d788d49580..5a8aa859b8 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -365,10 +365,6 @@ class PROTOBUF_EXPORT Option final : public ::google::protobuf::Message
       1, 2, 1,
       35, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Option_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -724,10 +720,6 @@ class PROTOBUF_EXPORT Field final : public ::google::protobuf::Message
       4, 10, 1,
       72, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Field_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -938,10 +930,6 @@ class PROTOBUF_EXPORT EnumValue final : public ::google::protobuf::Message
       2, 3, 1,
       38, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_EnumValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1225,10 +1213,6 @@ class PROTOBUF_EXPORT Type final : public ::google::protobuf::Message
       3, 7, 3,
       46, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Type_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1488,10 +1472,6 @@ class PROTOBUF_EXPORT Enum final : public ::google::protobuf::Message
       3, 6, 3,
       40, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Enum_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index bc9216efbf..cae5c85ebb 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -233,10 +233,6 @@ class PROTOBUF_EXPORT UInt64Value final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_UInt64Value_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -403,10 +399,6 @@ class PROTOBUF_EXPORT UInt32Value final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_UInt32Value_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -579,10 +571,6 @@ class PROTOBUF_EXPORT StringValue final : public ::google::protobuf::Message
       0, 1, 0,
       41, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_StringValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -749,10 +737,6 @@ class PROTOBUF_EXPORT Int64Value final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Int64Value_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -919,10 +903,6 @@ class PROTOBUF_EXPORT Int32Value final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_Int32Value_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1089,10 +1069,6 @@ class PROTOBUF_EXPORT FloatValue final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_FloatValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1259,10 +1235,6 @@ class PROTOBUF_EXPORT DoubleValue final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_DoubleValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1435,10 +1407,6 @@ class PROTOBUF_EXPORT BytesValue final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_BytesValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>
@@ -1605,10 +1573,6 @@ class PROTOBUF_EXPORT BoolValue final : public ::google::protobuf::Message
       0, 1, 0,
       0, 2>
       _table_;
-
-  static constexpr const void* _raw_default_instance_ =
-      &_BoolValue_default_instance_;
-
   friend class ::google::protobuf::MessageLite;
   friend class ::google::protobuf::Arena;
   template <typename T>