diff --git a/core/modules/image/src/Tests/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php
index 136b0f1..d81c04d 100644
--- a/core/modules/image/src/Tests/ImageDimensionsTest.php
+++ b/core/modules/image/src/Tests/ImageDimensionsTest.php
@@ -207,18 +207,14 @@ public function testImageDimensions() {
 
     $effect_id = $style->addImageEffect($effect);
     $style->save();
-    // @todo Uncomment this once
-    //   https://www.drupal.org/project/drupal/issues/2670966 is resolved.
-    // $this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="41" height="41" alt="" class="image-style-test" />');
+    $this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="41" height="41" alt="" class="image-style-test" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($this->getAbsoluteUrl($url));
     $this->assertResponse(200, 'Image was generated at the URL.');
     $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
     $image_file = $image_factory->get($generated_uri);
-    // @todo Uncomment this once
-    //   https://www.drupal.org/project/drupal/issues/2670966 is resolved.
-    // $this->assertEqual($image_file->getWidth(), 41);
-    // $this->assertEqual($image_file->getHeight(), 41);
+    $this->assertEqual($image_file->getWidth(), 41);
+    $this->assertEqual($image_file->getHeight(), 41);
 
     $effect_plugin = $style->getEffect($effect_id);
     $style->deleteImageEffect($effect_plugin);
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
index d43c803..af6bb6d 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Rotate.php
@@ -117,7 +117,7 @@ protected function execute(array $arguments) {
       }
 
       // Resizes the image if width and height are not as expected.
-      // PHP 7.0.25+ and 7.1.11+ GD rotates differently then it did in PHP 5.5
+      // PHP 7.0.26+ and 7.1.12+ GD rotates differently then it did in PHP 5.5
       // and above, resulting in different dimensions. Here we are harmonizing
       // final size across PHP versions by resizing the image to the dimensions
       // we expect.
diff --git a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index 96ce7e0..8148a89 100644
--- a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -214,9 +214,7 @@ public function testManipulations() {
     ];
 
     // Systems using non-bundled GD2 don't have imagerotate. Test if available.
-    // @todo Remove the version check once
-    //   https://www.drupal.org/project/drupal/issues/2670966 is resolved.
-    if (function_exists('imagerotate') && (version_compare(phpversion(), '7.0.26') < 0)) {
+    if (function_exists('imagerotate')) {
       $operations += [
         'rotate_5' => [
           'function' => 'rotate',