diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 768fac0..785c81c 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -447,8 +447,7 @@ public function setContext($name = NULL, ContextAwareInterface $parent = NULL) {
   public function isTranslatable() {
     // @todo Inject the entity manager and retrieve bundle info from it.
     $bundles = entity_get_bundles($this->entityType);
-    $info = $bundles[$this->bundle()];
-    return !empty($info['translatable']);
+    return !empty($bundles[$this->bundle()]['translatable']);
   }
 
 }
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
index 28b22cc..1ba0675 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Plugin/Core/Entity/ConfigTest.php
@@ -25,6 +25,7 @@
  *   },
  *   uri_callback = "config_test_uri",
  *   config_prefix = "config_test.dynamic",
+ *   translatable = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "label" = "label",
diff --git a/core/modules/field/field.multilingual.inc b/core/modules/field/field.multilingual.inc
index 99c7814..ffea445 100644
--- a/core/modules/field/field.multilingual.inc
+++ b/core/modules/field/field.multilingual.inc
@@ -230,7 +230,8 @@ function field_is_translatable($entity_type, $field) {
  * @todo Remove this once the migration to the Entity Field API is complete.
  */
 function field_has_translation_handler($entity_type, $handler = NULL) {
-  return TRUE;
+  $info = entity_get_info($entity_type);
+  return !empty($info['translatable']);
 }
 
 /**
diff --git a/core/modules/field/tests/modules/field_test/field_test.entity.inc b/core/modules/field/tests/modules/field_test/field_test.entity.inc
index 81c116d..565ed08 100644
--- a/core/modules/field/tests/modules/field_test/field_test.entity.inc
+++ b/core/modules/field/tests/modules/field_test/field_test.entity.inc
@@ -12,13 +12,8 @@
  * Implements hook_entity_info_alter().
  */
 function field_test_entity_info_alter(&$entity_info) {
-  // Enable/disable field_test as a translation handler.
   foreach (field_test_entity_info_translatable() as $entity_type => $translatable) {
-    $entity_info[$entity_type]['translation']['field_test'] = $translatable;
-  }
-  // Disable the entity type translation handler.
-  foreach ($entity_info as $entity_type => $info) {
-    $entity_info[$entity_type]['translation'][$entity_type] = FALSE;
+    $entity_info[$entity_type]['translatable'] = $translatable;
   }
 }
 
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php
index 31844b6..4de550b 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMul.php
@@ -27,6 +27,7 @@
  *   base_table = "entity_test_mul",
  *   data_table = "entity_test_mul_property_data",
  *   fieldable = TRUE,
+ *   translatable = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "uuid" = "uuid",
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php
index a12fc58..632ada7 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Plugin/Core/Entity/EntityTestMulRev.php
@@ -28,6 +28,7 @@
  *   data_table = "entity_test_mulrev_property_data",
  *   revision_table = "entity_test_mulrev_property_revision",
  *   fieldable = TRUE,
+ *   translatable = TRUE,
  *   entity_keys = {
  *     "id" = "id",
  *     "uuid" = "uuid",