diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 5b8cc1c..6bbb5a7 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -201,7 +201,7 @@ function language_theme() {
 function language_entity_supported() {
   $supported = array();
   foreach (entity_get_info() as $entity_type => $info) {
-    if ((!empty($info['fieldable']) || $entity_type == 'menu_link') && !empty($info['translatable'])) {
+    if (!empty($info['fieldable']) && !empty($info['translatable'])) {
       $supported[$entity_type] = $entity_type;
     }
   }
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 5052b8e..f841391 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -152,6 +152,7 @@ function menu_entity_info_alter(&$entity_info) {
     'default' => 'Drupal\menu\MenuFormController',
   );
   if (isset($entity_info['menu_link'])) {
+    // Upgrade path could pass partial definition because config imported first.
     $entity_info['menu_link']['entity_keys']['bundle'] = 'menu_name';
-    if (Drupal::moduleHandler()->moduleExists('language')) {
-      $entity_info['menu_link']['translatable'] = TRUE;
-    }
   }
 }