diff --git c/core/modules/content_translation/content_translation.module w/core/modules/content_translation/content_translation.module
index 7e7ebb5..8ac8aed 100644
--- c/core/modules/content_translation/content_translation.module
+++ w/core/modules/content_translation/content_translation.module
@@ -559,18 +559,9 @@ function content_translation_form_alter(array &$form, array &$form_state) {
     // Handle fields shared between translations when there is at least one
     // translation available or a new one is being created.
     if (!$entity->isNew() && (!isset($translations[$form_langcode]) || count($translations) > 1)) {
-      if ($entity instanceof EntityNG) {
-        foreach ($entity->getPropertyDefinitions() as $property_name => $definition) {
-          if (isset($form[$property_name])) {
-            $form[$property_name]['#multilingual'] = !empty($definition['translatable']);
-          }
-        }
-      }
-      else {
-        foreach (field_info_instances($entity->entityType(), $entity->bundle()) as $instance) {
-          $field_name = $instance['field_name'];
-          $field = $instance->getField();
-          $form[$field_name]['#multilingual'] = !empty($field['translatable']);
+      foreach ($entity->getPropertyDefinitions() as $property_name => $definition) {
+        if (isset($form[$property_name])) {
+          $form[$property_name]['#multilingual'] = !empty($definition['translatable']);
         }
       }
     }
diff --git c/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php w/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
index 0e2853e..273552f 100644
--- c/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
+++ w/core/modules/content_translation/lib/Drupal/content_translation/Controller/ContentTranslationController.php
@@ -88,8 +88,7 @@ public function overview(EntityInterface $entity) {
       // Determine whether the current entity is translatable.
       $translatable = FALSE;
       foreach ($this->fieldInfo->getBundleInstances($entity_type, $entity->bundle()) as $instance) {
-        $field = $instance->getField();
-        if ($field['translatable']) {
+        if ($instance->isFieldTranslatable()) {
           $translatable = TRUE;
           break;
         }
diff --git c/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php w/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
index 3006a75..4283782 100644
--- c/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
+++ w/core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
@@ -91,7 +91,7 @@ public function getQuestion() {
   public function getCancelRoute() {
     $entity_type = $this->entity->entityType();
     return array(
-      'route_name' => "content_translation.translation_edit.$entity_type",
+      'route_name' => "content_translation.translation_edit_$entity_type",
       'route_parameters' => array(
         'entity' => $this->entity->id(),
       ),