diff --git a/core/modules/image/image.post_update.php b/core/modules/image/image.post_update.php
index 04d8c4b7b9..c8b1603efd 100644
--- a/core/modules/image/image.post_update.php
+++ b/core/modules/image/image.post_update.php
@@ -20,3 +20,10 @@ function image_post_update_image_style_dependencies() {
     $display->save();
   }
 }
+
+/**
+ * Fix problem with image dimensions when using multiple upload.
+ */
+function image_post_update_multiple_upload_fix_with_dimensions() {
+  \Drupal::messenger()->addMessage(t('Fixed problem with incorrect processing of image dimensions when using multiple upload. To eliminate this problem for already existing records see <a href="https://www.drupal.org/project/drupal/issues/2967586">https://www.drupal.org/project/drupal/issues/2967586</a>'), 'status');
+}
diff --git a/core/modules/image/tests/src/Functional/ImageFieldWidgetMultipleTest.php b/core/modules/image/tests/src/Functional/ImageFieldWidgetMultipleTest.php
deleted file mode 100644
index 77c7129c80..0000000000
--- a/core/modules/image/tests/src/Functional/ImageFieldWidgetMultipleTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Drupal\Tests\image\Functional;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\node\Entity\Node;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\Tests\image\Kernel\ImageFieldCreationTrait;
-use Drupal\Tests\TestFileCreationTrait;
-
-/**
- * Tests the image field widget support multiple upload correctly.
- *
- * @group image
- */
-class ImageFieldWidgetMultipleTest extends BrowserTestBase {
-
-  use ImageFieldCreationTrait;
-  use TestFileCreationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'node',
-    'field_ui',
-    'image',
-  ];
-
-  /**
-   * Tests image widget element support multiple upload correctly.
-   */
-  public function testWidgetElementMultipleUploads() {
-    $image_factory = \Drupal::service('image.factory');
-    $file_system = \Drupal::service('file_system');
-
-    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
-    $field_name = 'images';
-    $storage_settings = ['cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED];
-    $field_settings = ['alt_field_required' => 0];
-    $this->createImageField($field_name, 'article', $storage_settings, $field_settings);
-    $this->drupalLogin($this->drupalCreateUser(['access content', 'create article content']));
-    $this->drupalGet('node/add/article');
-
-    $images = $this->getTestFiles('image');
-    $images = array_slice($images, 0, 5);
-
-    $paths = [];
-    foreach ($images as $image) {
-      $paths[] = $file_system->realpath($image->uri);
-    }
-
-    // @todo: Replace after https://www.drupal.org/project/drupal/issues/2917885
-    $submit_xpath = $this->assertSession()->buttonExists('Save')->getXpath();
-    $client = $this->getSession()->getDriver()->getClient();
-    $form = $client->getCrawler()->filterXPath($submit_xpath)->form();
-    $values = ['title' => [['value' => 'Test']]] + $form->getPhpValues();
-    $files = [];
-    foreach ($paths as $i => $path) {
-      $files['files']['images_0'][$i] = $path;
-    }
-    $client->request($form->getMethod(), $form->getUri(), $values, $files);
-
-    $node = Node::load(1);
-    foreach ($paths as $delta => $path) {
-      $node_image = $node->{$field_name}[$delta];
-      $original_image = $image_factory->get($path);
-      $this->assertEquals($node_image->width, $original_image->getWidth(), "Correct width of image #$delta");
-      $this->assertEquals($node_image->height, $original_image->getHeight(), "Correct height of image #$delta");
-    }
-  }
-
-}
diff --git a/core/modules/image/tests/src/FunctionalJavascript/ImageFieldWidgetMultipleTest.php b/core/modules/image/tests/src/FunctionalJavascript/ImageFieldWidgetMultipleTest.php
index 90f44d24ce..9c374aefe6 100644
--- a/core/modules/image/tests/src/FunctionalJavascript/ImageFieldWidgetMultipleTest.php
+++ b/core/modules/image/tests/src/FunctionalJavascript/ImageFieldWidgetMultipleTest.php
@@ -31,7 +31,6 @@ class ImageFieldWidgetMultipleTest extends JavascriptTestBase {
     'node',
     'field_ui',
     'image',
-    'image_field_repair',
   ];
 
   /**