diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index a6ce171..5395edb 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -293,22 +293,17 @@ function template_preprocess_image_style(&$variables) {
 
   $style->transformDimensions($dimensions);
 
-  // Add in the image style name as an HTML class.
-  $variables['attributes']['class'][] = 'image-style-' . drupal_html_class($variables['style_name']);
-
-  $variables['image'] = array(
-    '#theme' => 'image',
-    '#width' => $dimensions['width'],
-    '#height' => $dimensions['height'],
-    '#attributes' => $variables['attributes'],
-    '#uri' => $style->buildUrl($variables['uri']),
+  $variables['attributes'] = array(
+    'width' => $dimensions['width'],
+    'height' => $dimensions['height'],
+    'src' => $style->buildUrl($variables['uri']),
   );
 
   if (isset($variables['alt']) || array_key_exists('alt', $variables)) {
-    $variables['image']['#alt'] = $variables['alt'];
+    $variables['attributes']['alt'] = $variables['alt'];
   }
   if (isset($variables['title']) || array_key_exists('title', $variables)) {
-    $variables['image']['#title'] = $variables['title'];
+    $variables['attributes']['title'] = $variables['title'];
   }
 
 }
diff --git a/core/modules/image/templates/image-style.html.twig b/core/modules/image/templates/image-style.html.twig
index 0c3a291..971e89b 100644
--- a/core/modules/image/templates/image-style.html.twig
+++ b/core/modules/image/templates/image-style.html.twig
@@ -17,4 +17,5 @@
  * @ingroup themeable
  */
 #}
-{{ image }}
+{% set add_classes = ['image-style-' ~ style_name|clean_class] %}
+<img{{ attributes.addClass(add_classes) }} >