diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 357138c..981b95e 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -11,52 +11,51 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageManager;
-use Drupal\Core\Entity\EntityControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form controller for the user account forms.
  */
-abstract class AccountFormController extends EntityFormControllerNG implements EntityControllerInterface {
-
-   /**
-    * The module handler to invoke hooks on.
-    *
-    * @var \Drupal\Core\Extension\ModuleHandlerInterface
-    */
-   protected $moduleHandler;
- 
-   /**
-    * The language manager.
-    *
-    * @var \Drupal\Core\Language\LanguageManager
-    */
-   protected $languageManager;
- 
-   /**
-    * Constructs a new EntityFormController object.
-    *
-    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-    *   The module handler to invoke hooks on.
-    * @param \Drupal\Core\Language\LanguageManager $language_manager
-    *   The language manager.
-    */
-   public function __construct(ModuleHandlerInterface $module_handler, LanguageManager $language_manager) {
-     $this->moduleHandler = $module_handler;
-     $this->languageManager = $language_manager;
-   }
- 
-   /**
-    * {@inheritdoc}
-    */
-   public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
-     return new static(
-       $container->get('module_handler'),
-       $container->get('language_manager')
-     );
-   }
+abstract class AccountFormController extends EntityFormControllerNG {
+
+  /**
+   * The module handler to invoke hooks on.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManager
+   */
+  protected $languageManager;
  
   /**
+   * Constructs a new EntityFormController object.
+   *
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke hooks on.
+   * @param \Drupal\Core\Language\LanguageManager $language_manager
+   *   The language manager.
+   */
+  public function __construct(ModuleHandlerInterface $module_handler, LanguageManager $language_manager) {
+    $this->moduleHandler = $module_handler;
+    $this->languageManager = $language_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('module_handler'),
+      $container->get('language_manager')
+    );
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function form(array $form, array &$form_state) {