diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index bdcb5e9..f794e1a 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -83,15 +83,6 @@ function image_help($path, $arg) {
 }
 
 /**
- * Entity URI callback for image style.
- */
-function image_style_entity_uri(ImageStyle $style) {
-  return array(
-    'path' => 'admin/config/media/image-styles/manage/' . $style->id(),
-  );
-}
-
-/**
  * Implements hook_menu().
  */
 function image_menu() {
diff --git a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php
index c377781..ab9d07d 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/Core/Entity/ImageStyle.php
@@ -26,7 +26,6 @@
  *     },
  *     "storage" = "Drupal\image\ImageStyleStorageController"
  *   },
- *   uri_callback = "image_style_entity_uri",
  *   config_prefix = "image.style",
  *   entity_keys = {
  *     "id" = "name",
@@ -140,5 +139,17 @@ protected static function replaceImageStyle(ImageStyle $style) {
       }
     }
   }
-
+ 
+  /**
+   * {@inheritdoc}
+   */
+  public function uri() {
+    return array(
+      'path' => 'admin/config/media/image-styles/manage/' . $this->id(),
+      'options' => array(
+        'entity_type' => $this->entityType,
+        'entity' => $this,
+      ),
+    );
+  }
 }