diff --git a/python/google/protobuf/internal/symbol_database_test.py b/python/google/protobuf/internal/symbol_database_test.py
index 45cc979667..8614b267e9 100644
--- a/python/google/protobuf/internal/symbol_database_test.py
+++ b/python/google/protobuf/internal/symbol_database_test.py
@@ -35,13 +35,6 @@ class SymbolDatabaseTest(unittest.TestCase):
     db.RegisterServiceDescriptor(unittest_pb2._TESTSERVICE)
     return db
 
-  def testGetMessages(self):
-    messages = self._Database().GetMessages(
-        ['google/protobuf/unittest.proto'])
-    self.assertTrue(
-        unittest_pb2.TestAllTypes is
-        messages['protobuf_unittest.TestAllTypes'])
-
   def testGetSymbol(self):
     self.assertEqual(
         unittest_pb2.TestAllTypes, self._Database().GetSymbol(
diff --git a/python/google/protobuf/symbol_database.py b/python/google/protobuf/symbol_database.py
index 1941e8112d..e9a731a3c0 100644
--- a/python/google/protobuf/symbol_database.py
+++ b/python/google/protobuf/symbol_database.py
@@ -52,22 +52,26 @@ class SymbolDatabase():
     self.pool = pool or descriptor_pool.DescriptorPool()
 
   def GetPrototype(self, descriptor):
-    warnings.warn('SymbolDatabase.GetPrototype() is deprecated. Please '
-                  'use message_factory.GetMessageClass() instead. '
-                  'SymbolDatabase.GetPrototype() will be removed soon.')
+    warnings.warn(
+        'SymbolDatabase.GetPrototype() is deprecated. Please '
+        'use message_factory.GetMessageClass() instead. '
+        'SymbolDatabase.GetPrototype() will be removed in Jan 2025.'
+    )
     return message_factory.GetMessageClass(descriptor)
 
-  def CreatePrototype(self, descriptor):
-    warnings.warn('Directly call CreatePrototype() is wrong. Please use '
-                  'message_factory.GetMessageClass() instead. '
-                  'SymbolDatabase.CreatePrototype() will be removed soon.')
-    return message_factory._InternalCreateMessageClass(descriptor)
-
-  def GetMessages(self, files):
-    warnings.warn('SymbolDatabase.GetMessages() is deprecated. Please use '
-                  'message_factory.GetMessageClassedForFiles() instead. '
-                  'SymbolDatabase.GetMessages() will be removed soon.')
-    return message_factory.GetMessageClassedForFiles(files, self.pool)
+    def CreatePrototype(self, descriptor):
+      warnings.warn('Directly call CreatePrototype() is wrong. Please use '
+                    'message_factory.GetMessageClass() instead. '
+                    'SymbolDatabase.CreatePrototype() will be removed in '
+                    'Jan 2025.')
+      return message_factory._InternalCreateMessageClass(descriptor)
+
+    def GetMessages(self, files):
+      warnings.warn('SymbolDatabase.GetMessages() is deprecated. Please use '
+                    'message_factory.GetMessageClassedForFiles() instead. '
+                    'SymbolDatabase.GetMessages() will be removed in '
+                    'Jan 2025.')
+      return message_factory.GetMessageClassedForFiles(files, self.pool)
 
   def RegisterMessage(self, message):
     """Registers the given message type in the local database.