From 57384c7b095ad50a3164a8816bbaf08af4009f63 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Wed, 12 Jun 2013 17:45:12 +0100
Subject: [PATCH] Revert "Issue 2102916: follow up by Berdir, HEAD Broken."

This reverts commit 2db9d595dd5a74740b56ab5b079a99d1a5b24f61.
---
 .../lib/Drupal/menu_link/MenuLinkAccessController.php         | 4 ++--
 .../modules/system/lib/Drupal/system/MenuAccessController.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
index c3fec7cf35f..15d02eb9285 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkAccessController.php
@@ -9,7 +9,7 @@ namespace Drupal\menu_link;
 
 use Drupal\Core\Entity\EntityAccessController;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
+use Drupal\user\Plugin\Core\Entity\User;
 
 /**
  * Defines an access controller for the menu link entity.
@@ -21,7 +21,7 @@ class MenuLinkAccessController extends EntityAccessController {
   /**
    * {@inheritdoc}
    */
-  protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
+  protected function checkAccess(EntityInterface $entity, $operation, $langcode, User $account) {
     $access = user_access('administer menu', $account);
     if ($access && $operation == 'delete') {
       // Only items created by the menu module can be deleted.
diff --git a/core/modules/system/lib/Drupal/system/MenuAccessController.php b/core/modules/system/lib/Drupal/system/MenuAccessController.php
index d955d959cc1..25f3e9c4b62 100644
--- a/core/modules/system/lib/Drupal/system/MenuAccessController.php
+++ b/core/modules/system/lib/Drupal/system/MenuAccessController.php
@@ -9,7 +9,7 @@ namespace Drupal\system;
 
 use Drupal\Core\Entity\EntityAccessController;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
+use Drupal\user\Plugin\Core\Entity\User;
 
 /**
  * Defines an access controller for the menu entity.
@@ -21,7 +21,7 @@ class MenuAccessController extends EntityAccessController {
   /**
    * {@inheritdoc}
    */
-  protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
+  protected function checkAccess(EntityInterface $entity, $operation, $langcode, User $account) {
     if ($operation == 'delete') {
       // System-defined menus may not be deleted.
       // @todo Refactor https://drupal.org/node/1882552