diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php
index 98bfe6fbddf..169292f05fd 100644
--- a/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php
+++ b/core/modules/picture/lib/Drupal/picture/Plugin/Core/Entity/PictureMapping.php
@@ -30,7 +30,6 @@ use Drupal\picture\PictureMappingInterface;
  *     }
  *   },
  *   list_path = "admin/config/media/picturemapping",
- *   uri_callback = "picture_mapping_uri",
  *   config_prefix = "picture.mappings",
  *   entity_keys = {
  *     "id" = "id",
@@ -163,4 +162,16 @@ class PictureMapping extends ConfigEntityBase implements PictureMappingInterface
     return $mapping_found;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function uri() {
+    return array(
+      'path' => 'admin/config/media/picturemapping/' . $this->id(),
+      'options' => array(
+        'entity_type' => $this->entityType,
+        'entity' => $this,
+      ),
+    );
+  }
 }
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index e2902cef790..ef6ee48e618 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -116,24 +116,6 @@ function picture_mapping_load($id) {
   return entity_load('picture_mapping', $id);
 }
 
-/**
- * Gets Picture uri callback.
- */
-function picture_mapping_uri(PictureMapping $picture_mapping) {
-  return array(
-    'path' => 'admin/config/media/picturemapping/' . $picture_mapping->id(),
-  );
-}
-
-/**
- * Sets Picture uri callback.
- */
-function picture_mapping_set_uri(PictureMapping $picture_mapping) {
-  return array(
-    'path' => 'admin/config/media/picturemapping/' . $picture_mapping->id(),
-  );
-}
-
 /**
  * Implements hook_theme().
  */