diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php
index 3dfd81c..0e0d56f 100644
--- a/core/lib/Drupal/Core/Form/FormBase.php
+++ b/core/lib/Drupal/Core/Form/FormBase.php
@@ -56,10 +56,22 @@
   protected $errorHandler;
 
   /**
+   * Constructs a FormBase object.
+   *
+   * @param \Drupal\Core\Form\FormBuilder FormBuilder $form_builder
+   *   The FormBuilder object
+   */
+  public function __construct(FormBuilder $form_builder) {
+    $this->errorHandler = $form_builder;
+  }
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static();
+    return new static(
+      $container->get('form_builder')
+    );
   }
 
   /**
@@ -222,19 +234,6 @@ protected function container() {
   }
 
   /**
-   * Returns the form error handler.
-   *
-   * @return \Drupal\Core\Form\FormErrorInterface
-   *   The form error handler.
-   */
-  protected function errorHandler() {
-    if (!$this->errorHandler) {
-      $this->errorHandler = \Drupal::service('form_builder');
-    }
-    return $this->errorHandler;
-  }
-
-  /**
    * Files an error against a form element.
    *
    * @param string $name
@@ -247,7 +246,7 @@ protected function errorHandler() {
    * @see \Drupal\Core\Form\FormErrorInterface::setErrorByName()
    */
   protected function setFormError($name, array &$form_state, $message = '') {
-    $this->errorHandler()->setErrorByName($name, $form_state, $message);
+    $this->errorHandler->setErrorByName($name, $form_state, $message);
   }
 
 }