diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 618bfee..6d4450b 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -94,6 +94,11 @@
   protected $moduleHandler;
 
   /**
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected $formBuilder;
+
+  /**
    * Retrieves the entity manager service.
    *
    * @return \Drupal\Core\Entity\EntityManagerInterface
@@ -189,6 +194,18 @@ protected function moduleHandler() {
   }
 
   /**
+   * Returns the form builder service.
+   *
+   * @return \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected function formBuilder() {
+    if (!$this->formBuilder) {
+      $this->formBuilder = $this->container()->get('form_builder');
+    }
+    return $this->formBuilder;
+  }
+
+  /**
    * Returns the URL generator service.
    *
    * @return \Drupal\Core\Routing\UrlGeneratorInterface
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserController.php b/core/modules/user/lib/Drupal/user/Controller/UserController.php
index 495a5aa..7ebb3fd 100644
--- a/core/modules/user/lib/Drupal/user/Controller/UserController.php
+++ b/core/modules/user/lib/Drupal/user/Controller/UserController.php
@@ -39,7 +39,7 @@ public function userPage(Request $request) {
     else {
       // Sets the proper request.
       // @todo Remove when the request object is synchronized.
-      $form_builder = \Drupal::formBuilder();
+      $form_builder = $this->formBuilder();
       $form_builder->setRequest($request);
       $response = $form_builder->getForm('Drupal\user\Form\UserLoginForm');
     }