diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
index 1bc67da..9d2ed9b 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
@@ -137,4 +137,30 @@ public function testNodeTypeUpdate() {
     $configuration = language_get_default_configuration('node', 'article_2');
     $this->assertEqual($configuration, array('langcode' => 'current_interface', 'language_show' => TRUE), 'The default language configuration has been kept on the new Article content type.');
   }
+
+  /**
+   * Tests the language setting are deleted from config file on bundle delete.
+   */
+  public function testLanguageConfigurationElementDelete() {
+    $this->drupalGet('language-tests/language_configuration_element');
+    $edit['lang_configuration[langcode]'] = 'current_interface';
+    $edit['lang_configuration[language_show]'] = FALSE;
+    $this->drupalPost(NULL, $edit, 'Save');
+    $lang_conf = language_get_default_configuration('some_custom_type', 'some_bundle');
+
+    // Check that the settings have been saved.
+    $this->assertEqual($lang_conf['langcode'], 'current_interface');
+    $this->assertFalse($lang_conf['language_show']);
+    $this->drupalGet('language-tests/language_configuration_element');
+    $this->assertOptionSelected('edit-lang-configuration-langcode', 'current_interface');
+    $this->assertNoFieldChecked('edit-lang-configuration-language-show');
+
+    // Delete the bundle.
+    // ... how?
+
+    // Check that the settings have been deleted.
+    $settings = config('language.settings')->get(language_get_default_configuration_settings_key('some_custom_type', 'some_bundle'));
+    $this->assertNull($settings, 'The old settings were deleted.');
+  }
+
 }
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index aeba901..20f1972 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -1060,7 +1060,7 @@ function translation_entity_entity_bundle_delete($entity_type, $bundle) {
 }
 
 /**
- * Implements hook_entity_bundle_delete().
+ * Implements hook_entity_bundle_rename().
  */
 function translation_entity_entity_bundle_rename($entity_type, $bundle_old, $bundle_new) {
   $configuration = config('translation_entity.settings')->get(language_get_default_configuration_bundle_key($entity_type, $bundle_old));