diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index ffdb256..f092c86 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -94,7 +94,7 @@ function language_menu() {
     'file' => 'language.admin.inc',
   );
   $items['admin/config/regional/language/delete/%language'] = array(
-    'route_name' => 'language_admin_delete',
+    'route_name' => 'language_delete',
   );
 
   // Language negotiation.
@@ -868,10 +868,3 @@ function language_system_regional_settings_form_submit($form, &$form_state) {
   $language->default = TRUE;
   language_save($language);
 }
-
-/**
- * Implements hook_entity_info().
- */
-function language_entity_info(&$entity_info) {
-  $entity_info['language_entity']['controllers']['form']['delete'] = 'Drupal\language\Form\LanguageDeleteForm';
-}
diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml
index 2f1b8af..5158655 100644
--- a/core/modules/language/language.routing.yml
+++ b/core/modules/language/language.routing.yml
@@ -26,7 +26,7 @@ language_admin_overview:
   requirements:
     _permission: 'administer languages'
 
-language_admin_delete:
+language_delete:
   pattern: '/admin/config/regional/language/delete/{language_entity}'
   defaults:
     _entity_form: 'language_entity.delete'
diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/lib/Drupal/language/Entity/Language.php
index 15c6a67..8637a52 100644
--- a/core/modules/language/lib/Drupal/language/Entity/Language.php
+++ b/core/modules/language/lib/Drupal/language/Entity/Language.php
@@ -24,7 +24,10 @@
  *   controllers = {
  *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController",
  *     "list" = "Drupal\language\LanguageListController",
- *     "access" = "Drupal\language\LanguageAccessController"
+ *     "access" = "Drupal\language\LanguageAccessController",
+ *     "form" = {
+ *       "delete" = "Drupal\language\Form\LanguageDeleteForm"
+ *     }
  *   },
  *   config_prefix = "language.entity",
  *   entity_keys = {
diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php
index a7c8255..694f443 100644
--- a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php
+++ b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php
@@ -9,7 +9,6 @@
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Entity\EntityControllerInterface;
-use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Routing\PathBasedGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -23,13 +22,6 @@
 class LanguageDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface {
 
   /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManager
-   */
-  protected $entityManager;
-
-  /**
    * The urlGenerator service.
    *
    * @var \Drupal\Core\Routing\PathBasedGeneratorInterface
@@ -41,14 +33,11 @@ class LanguageDeleteForm extends EntityConfirmFormBase implements EntityControll
    *
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
-   * @param \Drupal\Core\Entity\EntityManager $entity_manager
-   *   The entity manager.
    * @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator
    *   The url generator service.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, EntityManager $entity_manager, PathBasedGeneratorInterface $url_generator) {
+  public function __construct(ModuleHandlerInterface $module_handler, PathBasedGeneratorInterface $url_generator) {
     parent::__construct($module_handler);
-    $this->entityManager = $entity_manager;
     $this->urlGenerator = $url_generator;
   }
 
@@ -58,7 +47,6 @@ public function __construct(ModuleHandlerInterface $module_handler, EntityManage
   public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
     return new static(
       $container->get('module_handler'),
-      $container->get('plugin.manager.entity'),
       $container->get('url_generator')
     );
   }
@@ -95,7 +83,7 @@ public function getConfirmText() {
    * {@inheritdoc}
    */
   public function getFormID() {
-    return 'language_admin_delete_form';
+    return 'language_delete_form';
   }
 
   /**
@@ -117,9 +105,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU
     if (!isset($languages[$langcode])) {
       throw new NotFoundHttpException();
     }
-    else {
-      return parent::buildForm($form, $form_state, $request);
-    }
+    return parent::buildForm($form, $form_state, $request);
   }
 
   /**