diff --git a/core/modules/image/lib/Drupal/image/ImageStyleFormController.php b/core/modules/image/lib/Drupal/image/ImageStyleFormController.php
index cd76f6e..8a6fd3c 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleFormController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleFormController.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityControllerInterface;
 use Drupal\Core\Entity\EntityFormController;
-use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
 use Drupal\image\ImageEffectManager;
@@ -23,11 +23,11 @@
 class ImageStyleFormController extends EntityFormController implements EntityControllerInterface {
 
   /**
-   * The entity manager service.
+   * The storage controller.
    *
-   * @var \Drupal\Core\Entity\EntityManager
+   * @var \Drupal\Core\Entity\EntityStorageControllerInterface
    */
-  protected $entityManager;
+  protected $storageController;
 
   /**
    * The image effect manager service.
@@ -48,16 +48,16 @@ class ImageStyleFormController extends EntityFormController implements EntityCon
    *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
-   * @param \Drupal\Core\Entity\EntityManager $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
+   *   The storage controller.
    * @param \Drupal\image\ImageEffectManager $image_effect_manager
    *   The image effect manager service.
    * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
    *   The translator service.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, EntityManager $entity_manager, ImageEffectManager $image_effect_manager, TranslatorInterface $translator) {
+  public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $storage_controller, ImageEffectManager $image_effect_manager, TranslatorInterface $translator) {
     $this->moduleHandler = $module_handler;
-    $this->entityManager = $entity_manager;
+    $this->storageController = $storage_controller;
     $this->imageEffectManager = $image_effect_manager;
     $this->translator = $translator;
     parent::__construct($this->moduleHandler);
@@ -69,7 +69,7 @@ public function __construct(ModuleHandlerInterface $module_handler, EntityManage
   public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
     return new static(
       $container->get('module_handler'),
-      $container->get('plugin.manager.entity'),
+      $container->get('plugin.manager.entity')->getStorageController($entity_type),
       $container->get('plugin.manager.image.effect'),
       $container->get('string_translation')
     );
@@ -81,7 +81,6 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   public function form(array $form, array &$form_state) {
     $form = parent::form($form, $form_state);
     $style = $this->entity;
-    $storage_controller = $this->entityManager->getStorageController('image_style');
 
     // @todo Remove drupal_set_title() in http://drupal.org/node/1981644
     $title = $this->translator->translate('Edit style %name', array('%name' => $style->label()));
@@ -107,7 +106,7 @@ public function form(array $form, array &$form_state) {
     $form['name'] = array(
       '#type' => 'machine_name',
       '#machine_name' => array(
-        'exists' => array($storage_controller, 'load'),
+        'exists' => array($this->storageController, 'load'),
       ),
       '#default_value' => $style->id(),
       '#required' => TRUE,