diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 939dc56..7227f48 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -97,7 +97,7 @@ function field_help($path, $arg) {
       $items = array();
       $info = system_get_info('module');
       $field_widgets = \Drupal::service('plugin.manager.field.widget')->getDefinitions();
-      $field_types = \Drupal::service('plugin.manager.field.field_type')->getDefinitions();
+      $field_types = \Drupal::service('plugin.manager.field.field_type')->getUiDefinitions();
       $providers = array();
       foreach (array_merge($field_types, $field_widgets) as $plugin) {
         $providers[] = $plugin['provider'];
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
index 25c5dd2..9c4de60 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldInstanceEditForm.php
@@ -8,7 +8,6 @@
 namespace Drupal\field_ui\Form;
 
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Field\ConfigFieldItemListInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Component\Utility\String;
 use Drupal\field\FieldInstanceConfigInterface;
@@ -138,8 +137,8 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn
     $form['instance']['settings'] = $items[0]->instanceSettingsForm($form, $form_state);
     $form['instance']['settings']['#weight'] = 10;
 
-    // Add a default value widget if item list supports that.
-    if ($items instanceof ConfigFieldItemListInterface && ($element = $items->defaultValuesForm($form, $form_state))) {
+    // Add handling for default value.
+    if ($element = $items->defaultValuesForm($form, $form_state)) {
       $element += array(
         '#type' => 'details',
         '#title' => $this->t('Default value'),