diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
index 4dda543..12fd8af 100644
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * @file Contains Drupal\Core\Routing\LinkGeneratorTrait.
+ * @file
+ * Contains \Drupal\Core\Routing\LinkGeneratorTrait.
  */
 
 namespace Drupal\Core\Routing;
 
 
+use Drupal\Core\Url;
 use Drupal\Core\Utility\LinkGeneratorInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
 
 /**
  * Wrapper methods for the Link Generator.
@@ -41,6 +42,21 @@ protected function l($text, $route_name, array $parameters = array(), array $opt
   }
 
   /**
+   * Renders a link to a URL.
+   *
+   * @param string $text
+   *   The link text for the anchor tag as a translated string.
+   * @param \Drupal\Core\Url $url
+   *   The URL object used for the link.
+   *
+   * @return string
+   *   An HTML string containing a link to the given route and parameters.
+   */
+  protected function linkFromUrl($text, Url $url) {
+    return $this->getLinkGenerator()->generateFromUrl($text, $url);
+  }
+
+  /**
    * Returns the link generator.
    *
    * @return \Drupal\Core\Utility\LinkGeneratorInterface
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index e71d9d0..e9257c6 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -12,6 +12,7 @@
 
 namespace Drupal\Core\Template;
 
+use Drupal\Core\Routing\LinkGeneratorTrait;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Url;
 use Drupal\Core\Utility\LinkGeneratorInterface;
@@ -25,6 +26,8 @@
  */
 class TwigExtension extends \Twig_Extension {
 
+  use LinkGeneratorTrait;
+
   /**
    * The URL generator.
    *
@@ -210,7 +213,7 @@ public function getUrlFromPath($path, $options = array()) {
    */
   public function getLink($text, $url) {
     if ($url instanceof Url) {
-      return $this->linkGenerator->generateFromUrl($text, $url);
+      return $this->linkFromUrl($text, $url);
     }
     else {
       // @todo Convert once https://www.drupal.org/node/2306901 is in
diff --git a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
index 1eef291..0ba4667 100644
--- a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Routing\LinkGeneratorTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -23,6 +24,8 @@
  */
 class FieldStorageConfigListBuilder extends ConfigEntityListBuilder {
 
+  use LinkGeneratorTrait;
+
   /**
    * An array of information about field types.
    *
@@ -112,7 +115,7 @@ public function buildRow(EntityInterface $field) {
     $usage = array();
     foreach ($field->getBundles() as $bundle) {
       if ($route_info = FieldUI::getOverviewRouteInfo($field->entity_type, $bundle)) {
-        $usage[] = \Drupal::linkGenerator()->generateFromUrl($this->bundles[$field->entity_type][$bundle]['label'], $route_info);
+        $usage[] = $this->linkFromUrl($this->bundles[$field->entity_type][$bundle]['label'], $route_info);
       }
       else {
         $usage[] = $this->bundles[$field->entity_type][$bundle]['label'];
diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php
index 1115070..cc390e0 100644
--- a/core/modules/menu_ui/src/MenuForm.php
+++ b/core/modules/menu_ui/src/MenuForm.php
@@ -269,7 +269,8 @@ protected function buildOverviewTreeForm($tree, $delta) {
         $id = 'menu_plugin_id:' . $link->getPluginId();
         $form[$id]['#item'] = $element;
         $form[$id]['#attributes'] = $link->isEnabled() ? array('class' => array('menu-enabled')) : array('class' => array('menu-disabled'));
-        $form[$id]['title']['#markup'] = $this->linkGenerator->generateFromUrl($link->getTitle(), $link->getUrlObject(), $link->getOptions());
+        $url_object = $link->getUrlObject()->setOptions($link->getOptions());
+        $form[$id]['title']['#markup'] = $this->linkFromUrl($link->getTitle(), $url_object);
         if (!$link->isEnabled()) {
           $form[$id]['title']['#markup'] .= ' (' . $this->t('disabled') . ')';
         }
diff --git a/core/modules/system/src/Tests/Theme/EngineTwigTest.php b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
index a98bb3c..90b0e16 100644
--- a/core/modules/system/src/Tests/Theme/EngineTwigTest.php
+++ b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
@@ -73,7 +73,7 @@ public function testTwigLinkGenerator() {
     $link_generator = $this->container->get('link_generator');
 
     $expected = [
-      'link via the linkgenerator: ' . $link_generator->generateFromUrl('register', new Url('user.register')),
+      'link via the linkgenerator: ' . $link_generator->generate('register', 'user.register'),
     ];
 
     $content = $this->getRawContent();