diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 24747215ec59a..47cf572c40827 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -163,18 +163,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 
 #endif
 
-// Introducing a future-breaking change guard for descriptor database migration.
-// This allows google3 to transition to absl::string_view while keeping OSS
-// on std::string until the migration is fully completed.
-// The temporary macro enables incremental migration before permanently flipping
-// the switch.
-#ifdef PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE
-#error PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE was previously defined
-#endif
-
-#if defined(PROTOBUF_TEMPORARY_ENABLE_STRING_VIEW_DESCRIPTOR_DATABASE)
 #define PROTOBUF_FUTURE_STRING_VIEW_DESCRIPTOR_DATABASE 1
-#endif
 
 #ifdef PROTOBUF_ALWAYS_INLINE
 #error PROTOBUF_ALWAYS_INLINE was previously defined