diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 23d62e2..b1db403 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -166,6 +166,19 @@ function menu_menu() {
  */
 function menu_entity_info_alter(&$entity_info) {
   $entity_info['menu']['list_controller_class'] = 'Drupal\menu\MenuListController';
+  $entity_info['menu']['uri_callback'] = 'menu_uri';
+}
+
+/**
+ * Entity URI callback.
+ *
+ * @param Drupal\system\Plugin\Core\Entity\Menu $menu
+ *   A Menu entity.
+ */
+function menu_uri(Menu $menu) {
+  return array(
+    'path' => 'admin/structure/menu/manage/' . $menu->id(),
+  );
 }
 
 /**
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php
index 94f957b..bafdf0f 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Core/Entity/Menu.php
@@ -57,17 +57,4 @@ class Menu extends ConfigEntityBase {
    */
   public $description;
 
-  /**
-   * Overrides \Drupal\Core\Entity\Entity::uri().
-   */
-  public function uri() {
-    return array(
-      'path' => 'admin/structure/menu/manage/' . $this->id(),
-      'options' => array(
-        'entity_type' => $this->entityType,
-        'entity' => $this,
-      ),
-    );
-  }
-
 }