diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 0e39ac5..9872c1a 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -382,15 +382,14 @@ public static function isAvailable() {
   public static function getSupportedExtensions() {
     $extensions = array();
     foreach (static::supportedTypes() as $image_type) {
+      // @todo Automatically fetch possible extensions for each mime type.
+      // @see https://www.drupal.org/node/2311679
       $extension = Unicode::strtolower(image_type_to_extension($image_type, FALSE));
       $extensions[] = $extension;
       // Add some known similar extensions.
-      // @todo Figure out how to handle this better.
       if ($extension === 'jpeg') {
         $extensions[] = 'jpg';
-      }
-      elseif ($extension === 'tiff') {
-        $extensions[] = 'tif';
+        $extensions[] = 'jpe';
       }
     }
     return $extensions;