diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
index ecab4c4..128f52c 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
@@ -131,7 +131,7 @@ function testSettingsUI() {
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertSettings($entity_type, $bundle, $enabled, $edit) {
-    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save'));
+    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
     $args = array('@entity_type' => $entity_type, '@bundle' => $bundle, '@enabled' => $enabled ? 'enabled' : 'disabled');
     $message = format_string('Translation for entity @entity_type (@bundle) is @enabled.', $args);
     field_info_cache_clear();
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index cd12c60..be61a58 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Core\Language\LanguageManager;
-use Drupal\language\Form\ContentLanguageSettingsForm;
 
 /**
  * Prepare a language code list for unused predefined languages.
@@ -338,15 +337,6 @@ function theme_language_negotiation_configure_browser_form_table($variables) {
 }
 
 /**
- * Returns the content language settings form.
- *
- * @deprecated Use \Drupal\language\Controller\LanguageController::contentSettings()
- */
-function language_content_settings_page() {
-  return drupal_get_form(ContentLanguageSettingsForm::create(\Drupal::getContainer()), language_entity_supported());
-}
-
-/**
  * Implements hook_preprocess_HOOK() for theme_language_content_settings_table().
  */
 function template_preprocess_language_content_settings_table(&$variables) {
diff --git a/core/modules/language/language.routing.yml b/core/modules/language/language.routing.yml
index 42bd9b3..808c111 100644
--- a/core/modules/language/language.routing.yml
+++ b/core/modules/language/language.routing.yml
@@ -74,6 +74,6 @@ language.content_settings_page:
   path: '/admin/config/regional/content-language'
   defaults:
     _title: 'Content language settings'
-    _content: '\Drupal\language\Controller\LanguageController::contentSettings'
+    _form: '\Drupal\language\Form\ContentLanguageSettingsForm'
   requirements:
     _permission: 'administer languages'
diff --git a/core/modules/language/lib/Drupal/language/Controller/LanguageController.php b/core/modules/language/lib/Drupal/language/Controller/LanguageController.php
deleted file mode 100644
index 0724471..0000000
--- a/core/modules/language/lib/Drupal/language/Controller/LanguageController.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Controller\LanguageController.
- */
-
-namespace Drupal\language\Controller;
-
-/**
- * Returns responses for language routes.
- */
-class LanguageController {
-
-  /**
-   * @todo Remove language_content_settings_page().
-   */
-  public function contentSettings() {
-    module_load_include('admin.inc', 'language');
-    return language_content_settings_page();
-  }
-
-}
diff --git a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php b/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
index f4d7c54..2980fb2 100644
--- a/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
+++ b/core/modules/language/lib/Drupal/language/Form/ContentLanguageSettingsForm.php
@@ -90,7 +90,7 @@ public function buildForm(array $form, array &$form_state) {
       $default[$entity_type] = FALSE;
 
       // Check whether we have any custom setting.
-      foreach ($bundles as $bundle => $bundle_info) {
+      foreach ($bundles[$entity_type] as $bundle => $bundle_info) {
         $conf = language_get_default_configuration($entity_type, $bundle);
         if (!empty($conf['language_show']) || $conf['langcode'] != 'site_default') {
           $default[$entity_type] = $entity_type;
@@ -135,7 +135,7 @@ public function buildForm(array $form, array &$form_state) {
         ),
       );
 
-      foreach ($bundles as $bundle => $bundle_info) {
+      foreach ($bundles[$entity_type] as $bundle => $bundle_info) {
         $form['settings'][$entity_type][$bundle]['settings'] = array(
           '#type' => 'item',
           '#label' => $bundle_info['label'],
@@ -151,12 +151,6 @@ public function buildForm(array $form, array &$form_state) {
       }
     }
 
-    $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-    );
-
     return parent::buildForm($form, $form_state);
   }
 
@@ -170,7 +164,7 @@ public function submitForm(array &$form, array &$form_state) {
           $config->set(language_get_default_configuration_settings_key($entity_type, $bundle),
             array(
               'langcode' => $bundle_settings['settings']['language']['langcode'],
-              'language_show' => $bundle_settings['settings']['langcode']['language_show'],
+              'language_show' => $bundle_settings['settings']['language']['language_show'],
             )
           );
       }