diff --git a/core/lib/Drupal/Core/Path/Entity/Alias.php b/core/lib/Drupal/Core/Path/Entity/Alias.php
index 15b4618..862640e 100644
--- a/core/lib/Drupal/Core/Path/Entity/Alias.php
+++ b/core/lib/Drupal/Core/Path/Entity/Alias.php
@@ -43,12 +43,7 @@
  *     "uuid" = "uuid"
  *   },
  *   permission_granularity = "entity_type",
- *   admin_permission = "administer url aliases",
- *   links = {
- *     "canonical" = "alias.view",
- *     "delete-form" = "alias.delete_confirm",
- *     "edit-form" = "alias.edit",
- *   }
+ *   admin_permission = "administer url aliases"
  * )
  */
 class Alias extends ContentEntityBase implements AliasInterface {
diff --git a/core/modules/path/src/Controller/PathController.php b/core/modules/path/src/Controller/PathController.php
index 5556012..cefbda3 100644
--- a/core/modules/path/src/Controller/PathController.php
+++ b/core/modules/path/src/Controller/PathController.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Path\AliasStorageInterface;
 use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -64,10 +65,10 @@ public function adminOverview($keys) {
     $destination = drupal_get_destination();
     foreach ($this->entityManager()->getStorage('alias')->getAliasesForAdminListing($header, $keys) as $data) {
       $row = array();
-      $row['data']['alias'] = l(truncate_utf8($data->alias, 50, FALSE, TRUE), $data->path, array(
+      $row['data']['alias'] = _l(truncate_utf8($data->alias, 50, FALSE, TRUE), $data->path, array(
         'attributes' => array('title' => $data->alias),
       ));
-      $row['data']['source'] = l(truncate_utf8($data->path, 50, FALSE, TRUE), $data->path, array(
+      $row['data']['source'] = _l(truncate_utf8($data->path, 50, FALSE, TRUE), $data->path, array(
         'alias' => TRUE,
         'attributes' => array('title' => $data->path),
       ));
diff --git a/core/modules/system/src/Tests/Path/AliasTest.php b/core/modules/system/src/Tests/Path/AliasTest.php
index cf32a41..0674b0a 100644
--- a/core/modules/system/src/Tests/Path/AliasTest.php
+++ b/core/modules/system/src/Tests/Path/AliasTest.php
@@ -80,10 +80,6 @@ function testCRUD() {
       $this->assertEqual($loadedAlias->get('langcode')->value, $alias['langcode'], format_string('Loaded the expected langcode with aid %aid.', array('%aid' => $aid)));
     }
 
-    // Load alias by source path.
-    $loadedAlias = $aliasStorage->load(array('source' => 'node/1'));
-    $this->assertEqual($loadedAlias['alias'], 'alias_for_node_1_und', format_string('The last created alias loaded by default.'));
-
     //Update a few aliases
     foreach ($aliases as $alias) {
       $loadedAlias = $this->container->get('entity.manager')