diff --git a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
index 35e3609a52e91d94108efdad0cd08cd2b2e28bb7..ff323d20f94de47558cbd9406fd9e0ddd208d210 100644
--- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
@@ -180,7 +180,7 @@ public function deleteAll() {
   public function deleteByType($type) {
     // Proxy to the Messenger service, if it exists.
     if ($messenger = $this->getMessengerService()) {
-      return $messenger->deleteByType($type);
+      return $messenger->messagesByType($type);
     }
 
     $messages = static::$messages[$type];
diff --git a/core/modules/file/src/Tests/SaveUploadFormTest.php b/core/modules/file/src/Tests/SaveUploadFormTest.php
index e568070616d5fa3a0e639b46e66a3a9196f12543..07ebd1dc24f052340487233e6ab5c825b66a20f1 100644
--- a/core/modules/file/src/Tests/SaveUploadFormTest.php
+++ b/core/modules/file/src/Tests/SaveUploadFormTest.php
@@ -419,7 +419,7 @@ public function testErrorMessagesAreNotChanged() {
     // after calling _file_save_upload_from_form() are correct.
     $this->assertText($error);
     $this->assertRaw('Number of error messages before _file_save_upload_from_form(): 1');
-    $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 1');
+    $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 2');
 
     // Test a successful upload with no messages.
     $edit = [
diff --git a/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php b/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
index be687f8c593fb3548bd068e3f3fe22eebbf4f6ed..29334647db175319cc1dd9e8d5d8da3539ea9921 100644
--- a/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Messenger/MessengerLegacyTest.php
@@ -103,11 +103,6 @@ public function testMessages() {
     $this->assertCount(4, $messages[MessengerInterface::TYPE_STATUS]);
     $this->assertCount(4, $messages[MessengerInterface::TYPE_WARNING]);
     $this->assertCount(4, $messages[MessengerInterface::TYPE_ERROR]);
-
-    // Test deleteByType().
-    $this->assertCount(4, $messenger->deleteByType(MessengerInterface::TYPE_WARNING));
-    $this->assertCount(0, $messenger->messagesByType(MessengerInterface::TYPE_WARNING));
-    $this->assertCount(4, $messenger->messagesByType(MessengerInterface::TYPE_ERROR));
   }
 
 }