diff --git a/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php b/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
index c36447d..f9883b8 100644
--- a/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldTypePluginManagerInterface.php
@@ -39,7 +39,7 @@ public function getDefaultInstanceSettings($type);
   public function getDefaultSettings($type);
 
   /**
-   * Gets the definition of all field types that could be added via UI.
+   * Gets the definition of all field types that can be added via UI.
    *
    * @return array
    *   An array of field type definitions.
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 097cb78..4061b12 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -18,7 +18,6 @@
  *   id = "email",
  *   label = @Translation("E-mail"),
  *   description = @Translation("An entity field containing an e-mail value."),
- *   no_ui = TRUE,
  *   default_widget = "email_default",
  *   default_formatter = "string"
  * )
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 8e3cfb4..8ea5d1c 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -6,10 +6,10 @@
  */
 
 use Drupal\Component\Utility\String;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Language\Language;
 use Drupal\field\Field as FieldService;
+use Drupal\field\FieldInstanceConfigInterface;
 
 /**
  * Returns a form element to configure field synchronization.
@@ -102,14 +102,13 @@ function _content_translation_form_language_content_settings_form_alter(array &$
             // translation.
             // @todo Remove this special casing as soon as configurable and
             //   base field definitions are "unified".
-            if ($field = FieldService::fieldInfo()->getField($entity_type_id, $field_name)) {
-              $instance = FieldService::fieldInfo()->getInstance($entity_type_id, $bundle, $field_name);
+            if ($definition instanceof FieldInstanceConfigInterface) {
               $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = array(
-                '#label' => $instance->getLabel(),
+                '#label' => $definition->getLabel(),
                 '#type' => 'checkbox',
                 '#default_value' => $translatable,
               );
-              $column_element = content_translation_field_sync_widget($instance);
+              $column_element = content_translation_field_sync_widget($definition);
               if ($column_element) {
                 $form['settings'][$entity_type_id][$bundle]['columns'][$field_name] = $column_element;