diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
index 931f3ef..c62f4a7 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Tests/CustomBlockFieldTest.php
@@ -78,19 +78,17 @@ public function testBlockFields() {
         'title' => DRUPAL_OPTIONAL,
       ),
     );
-    $form_display_options = array(
-      'type' => 'link_default',
-    );
-    $display_options = array(
-      'type' => 'link',
-      'label' => 'hidden',
-    );
     field_create_instance($this->instance);
     entity_get_form_display('custom_block', 'link', 'default')
-      ->setComponent($this->field['field_name'], $form_display_options)
+      ->setComponent($this->field['field_name'], array(
+        'type' => 'link_default',
+      ))
       ->save();
     entity_get_display('custom_block', 'link', 'default')
-      ->setComponent($this->field['field_name'], $display_options)
+      ->setComponent($this->field['field_name'], array(
+        'type' => 'link',
+        'label' => 'hidden',
+      ))
       ->save();
 
     // Create a block.
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php
index 1c5cac3..f0d60fe 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php
@@ -36,16 +36,7 @@
 class DateTimeDatelistWidget extends WidgetBase {
 
   /**
-   * Constructs a DateTimeDatelist Widget object.
-   *
-   * @param array $plugin_id
-   *   The plugin_id for the widget.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\field\Plugin\Core\Entity\FieldInstance $instance
-   *   The field instance to which the widget is associated.
-   * @param array $settings
-   *   The widget settings.
+   * {@inheritdoc}
    */
   public function __construct($plugin_id, array $plugin_definition, FieldInstance $instance, array $settings) {
     // Identify the function used to set the default value.
diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php
index 683ae6e..f0c45c0 100644
--- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php
+++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php
@@ -30,16 +30,7 @@
 class DateTimeDefaultWidget extends WidgetBase {
 
   /**
-   * Constructs a DateTimeDefault Widget object.
-   *
-   * @param array $plugin_id
-   *   The plugin_id for the widget.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\field\Plugin\Core\Entity\FieldInstance $instance
-   *   The field instance to which the widget is associated.
-   * @param array $settings
-   *   The widget settings.
+   * {@inheritdoc}
    */
   public function __construct($plugin_id, array $plugin_definition, FieldInstance $instance, array $settings) {
     // Identify the function used to set the default value.
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
index 22dbfd4..ea7433f 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityFormDisplay.php
@@ -19,7 +19,9 @@
  *   id = "entity_form_display",
  *   label = @Translation("Entity form display"),
  *   module = "entity",
- *   controller_class = "Drupal\Core\Config\Entity\ConfigStorageController",
+ *   controllers = {
+ *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController"
+ *   },
  *   config_prefix = "entity.form_display",
  *   entity_keys = {
  *     "id" = "id",
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 00553fa..dc20e25 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -271,31 +271,35 @@ function field_update_8002() {
     }
 
     // Migrate 'widget' settings.
-    $widget_options = $data['widget'];
-    // Determine name and create initial entry in the $form_displays array.
-    $form_display_id = $record->entity_type . '.' . $record->bundle . '.default';
-    if (!isset($form_displays[$form_display_id])) {
-      $form_displays[$form_display_id] = _update_8000_entity_get_form_display($record->entity_type, $record->bundle, 'default');
-    }
+    if (isset($data['widget'])) {
+      $widget_options = $data['widget'];
+      // Determine name and create initial entry in the $form_displays array.
+      $form_display_id = $record->entity_type . '.' . $record->bundle . '.default';
+      if (!isset($form_displays[$form_display_id])) {
+        $form_displays[$form_display_id] = _update_8000_entity_get_form_display($record->entity_type, $record->bundle, 'default');
+      }
 
-    // We do not need the 'module' key anymore.
-    unset($widget_options['module']);
-    $form_displays[$form_display_id]->set("content.$record->field_name", $widget_options);
+      // We do not need the 'module' key anymore.
+      unset($widget_options['module']);
+      $form_displays[$form_display_id]->set("content.$record->field_name", $widget_options);
+    }
 
     // Migrate 'display' settings.
-    foreach ($data['display'] as $view_mode => $display_options) {
-      // Determine name and create initial entry in the $displays array if it
-      // does not exist yet.
-      $display_id = $record->entity_type . '.' . $record->bundle . '.' . $view_mode;
-      if (!isset($displays[$display_id])) {
-        $displays[$display_id] = _update_8000_entity_get_display($record->entity_type, $record->bundle, $view_mode);
-      }
+    if (isset($data['display'])) {
+      foreach ($data['display'] as $view_mode => $display_options) {
+        // Determine name and create initial entry in the $displays array if it
+        // does not exist yet.
+        $display_id = $record->entity_type . '.' . $record->bundle . '.' . $view_mode;
+        if (!isset($displays[$display_id])) {
+          $displays[$display_id] = _update_8000_entity_get_display($record->entity_type, $record->bundle, $view_mode);
+        }
 
-      // The display object does not store hidden fields.
-      if ($display_options['type'] != 'hidden') {
-        // We do not need the 'module' key anymore.
-        unset($display_options['module']);
-        $displays[$display_id]->set("content.$record->field_name", $display_options);
+        // The display object does not store hidden fields.
+        if ($display_options['type'] != 'hidden') {
+          // We do not need the 'module' key anymore.
+          unset($display_options['module']);
+          $displays[$display_id]->set("content.$record->field_name", $display_options);
+        }
       }
     }
 
diff --git a/core/modules/field/tests/modules/field_test_config/config/field.instance.test_entity.test_bundle.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/field.instance.test_entity.test_bundle.field_test_import.yml
index 4817a77..a179a55 100644
--- a/core/modules/field/tests/modules/field_test_config/config/field.instance.test_entity.test_bundle.field_test_import.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/field.instance.test_entity.test_bundle.field_test_import.yml
@@ -11,10 +11,4 @@ default_value_function: ''
 settings:
   text_processing: '0'
   user_register_form: false
-widget:
-  weight: '-2'
-  type: text_textfield
-  module: text
-  settings:
-    size: '60'
 field_type: text
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging.yml
index 2e4229d..f751ad5 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.test_entity.test_bundle.field_test_import_staging.yml
@@ -12,10 +12,4 @@ default_value_function: ''
 settings:
   text_processing: '0'
   user_register_form: '0'
-widget:
-  type: text_textfield
-  weight: '-3'
-  settings:
-    size: '60'
-  module: text
 field_type: text
diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc
index f5c27eb..5acd486 100644
--- a/core/modules/field_ui/field_ui.admin.inc
+++ b/core/modules/field_ui/field_ui.admin.inc
@@ -462,7 +462,6 @@ function field_ui_existing_field_options($entity_type, $bundle) {
       if (!($existing_bundle == $bundle && $existing_entity_type == $entity_type)) {
         foreach ($instances as $instance) {
           $field = field_info_field($instance['field_name']);
-          $widget = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($instance['field_name']);
           // Don't show
           // - locked fields,
           // - fields already in the current bundle,
@@ -473,6 +472,7 @@ function field_ui_existing_field_options($entity_type, $bundle) {
             && !field_info_instance($entity_type, $field['field_name'], $bundle)
             && (empty($field['entity_types']) || in_array($entity_type, $field['entity_types']))
             && empty($field_types[$field['type']]['no_ui'])) {
+            $widget = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default')->getComponent($instance['field_name']);
             $info[$instance['field_name']] = array(
               'type' => $field['type'],
               'type_label' => $field_types[$field['type']]['label'],
@@ -683,7 +683,6 @@ function field_ui_widget_type_form_submit($form, &$form_state) {
   $field_name = $form['#field_name'];
   $instance = $form['#instance'];
 
-  // Update the stored instance with the incoming values.
   $entity_form_display = entity_get_form_display($entity_type, $bundle)
     ->setComponent($field_name, array(
       'type' => $form_values['widget_type'],
@@ -788,6 +787,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
   $bundle = $instance['bundle'];
   $entity_type = $instance['entity_type'];
   $field = field_info_field($instance['field_name']);
+  $entity_form_display = entity_get_form_display($entity_type, $bundle);
   $bundles = entity_get_bundles();
 
   drupal_set_title(t('%instance settings for %bundle', array(
@@ -797,7 +797,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
 
   $form['#field'] = $field;
   $form['#instance'] = $instance;
-  $form['#entity_form_display'] = $entity_form_display = entity_get_form_display($entity_type, $bundle);
+  $form['#entity_form_display'] = $entity_form_display;
   // Create an arbitrary entity object (used by the 'default value' widget).
   $ids = (object) array('entity_type' => $instance['entity_type'], 'bundle' => $instance['bundle'], 'entity_id' => NULL);
   $form['#entity'] = _field_create_entity_from_ids($ids);
@@ -810,9 +810,6 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
     return $form;
   }
 
-  $widget_configuration = $entity_form_display->getComponent($instance['field_name']);
-  $widget = $entity_form_display->getWidget($instance['field_name']);
-
   // Create a form structure for the instance values.
   $form['instance'] = array(
     '#tree' => TRUE,
@@ -857,12 +854,6 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
     '#weight' => -5,
   );
 
-  // Build the widget component of the instance.
-  $form['instance']['widget']['type'] = array(
-    '#type' => 'value',
-    '#value' => $widget_configuration['type'],
-  );
-
   // Add additional field instance settings from the field module.
   $additions = module_invoke($field['module'], 'field_instance_settings_form', $field, $instance, $form_state);
   if (is_array($additions)) {
@@ -871,7 +862,7 @@ function field_ui_field_edit_form($form, &$form_state, $instance) {
   }
 
   // Add widget settings for the widget type.
-  $additions = $widget->settingsForm($form, $form_state);
+  $additions = $entity_form_display->getWidget($instance['field_name'])->settingsForm($form, $form_state);
   $form['instance']['widget']['settings'] = $additions ? $additions : array('#type' => 'value', '#value' => array());
   $form['instance']['widget']['#weight'] = 20;
 
@@ -911,6 +902,7 @@ function field_ui_field_edit_form_delete_submit($form, &$form_state) {
  */
 function field_ui_default_value_widget($field, $instance, &$form, &$form_state) {
   $entity = $form['#entity'];
+  $entity_form_display = $form['#entity_form_display'];
 
   $element = array(
     '#type' => 'details',
@@ -947,7 +939,7 @@ function field_ui_default_value_widget($field, $instance, &$form, &$form_state)
   if (!empty($instance['default_value'])) {
     $items = (array) $instance['default_value'];
   }
-  $element += entity_get_form_display($instance['entity_type'], $instance['bundle'])->getWidget($instance['field_name'])->form($entity, LANGUAGE_NOT_SPECIFIED, $items, $element, $form_state);
+  $element += $entity_form_display->getWidget($instance['field_name'])->form($entity, LANGUAGE_NOT_SPECIFIED, $items, $element, $form_state);
 
   return $element;
 }
@@ -1017,7 +1009,9 @@ function field_ui_field_edit_form_submit($form, &$form_state) {
   }
 
   // Handle widget settings.
-  $entity_form_display->setComponent($instance['field_name'], $form_state['values']['instance']['widget'])->save();
+  $options = $entity_form_display->getComponent($instance['field_name']);
+  $options['settings'] = $form_state['values']['instance']['widget']['settings'];
+  $entity_form_display->setComponent($instance['field_name'], $options);
   unset($form_state['values']['instance']['widget']);
 
   // Merge incoming values into the instance.
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 7ee40f4..4a385b8 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -46,7 +46,7 @@ public function buildForm(array $form, array &$form_state) {
     $instances = field_info_instances($this->entity_type, $this->bundle);
     $field_types = field_info_field_types();
     $extra_fields = field_info_extra_fields($this->entity_type, $this->bundle, 'display');
-    $entity_display = entity_get_display($this->entity_type, $this->bundle, $this->view_mode);
+    $entity_display = entity_get_display($this->entity_type, $this->bundle, $this->mode);
 
     $form_state += array(
       'formatter_settings_edit' => NULL,
@@ -55,7 +55,7 @@ public function buildForm(array $form, array &$form_state) {
     $form += array(
       '#entity_type' => $this->entity_type,
       '#bundle' => $this->bundle,
-      '#view_mode' => $this->view_mode,
+      '#view_mode' => $this->mode,
       '#fields' => array_keys($instances),
       '#extra' => array_keys($extra_fields),
     );
@@ -173,7 +173,7 @@ public function buildForm(array $form, array &$form_state) {
       if ($display_options && $display_options['type'] != 'hidden') {
         $formatter = drupal_container()->get('plugin.manager.field.formatter')->getInstance(array(
           'instance' => $instance,
-          'view_mode' => $this->view_mode,
+          'view_mode' => $this->mode,
           'configuration' => $display_options
         ));
       }
@@ -206,7 +206,7 @@ public function buildForm(array $form, array &$form_state) {
             'formatter' => $formatter,
             'field' => $field,
             'instance' => $instance,
-            'view_mode' => $this->view_mode,
+            'view_mode' => $this->mode,
             'form' => $form,
           );
           drupal_alter('field_formatter_settings_form', $settings_form, $form_state, $context);
@@ -258,7 +258,7 @@ public function buildForm(array $form, array &$form_state) {
             'formatter' => $formatter,
             'field' => $field,
             'instance' => $instance,
-            'view_mode' => $this->view_mode,
+            'view_mode' => $this->mode,
           );
           drupal_alter('field_formatter_settings_summary', $summary, $context);
 
@@ -342,7 +342,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['fields'] = $table;
 
     // Custom display settings.
-    if ($this->view_mode == 'default') {
+    if ($this->mode == 'default') {
       $view_modes = entity_get_view_modes($this->entity_type);
       // Only show the settings if there is more than one view mode.
       if (count($view_modes) > 1) {
@@ -411,7 +411,7 @@ public function buildForm(array $form, array &$form_state) {
    */
   public function submitForm(array &$form, array &$form_state) {
     $form_values = $form_state['values'];
-    $display = entity_get_display($this->entity_type, $this->bundle, $this->view_mode);
+    $display = entity_get_display($this->entity_type, $this->bundle, $this->mode);
 
     // Collect data for 'regular' fields.
     foreach ($form['#fields'] as $field_name) {
@@ -466,7 +466,7 @@ public function submitForm(array &$form, array &$form_state) {
     $display->save();
 
     // Handle the 'view modes' checkboxes if present.
-    if ($this->view_mode == 'default' && !empty($form_values['view_modes_custom'])) {
+    if ($this->mode == 'default' && !empty($form_values['view_modes_custom'])) {
       $entity_info = entity_get_info($this->entity_type);
       $view_modes = entity_get_view_modes($this->entity_type);
       $bundle_settings = field_bundle_settings($this->entity_type, $this->bundle);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index cd95a50..75eaae8 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -15,16 +15,6 @@
 class FieldOverview extends OverviewBase {
 
   /**
-   * Overrides Drupal\field_ui\OverviewBase::__construct().
-   */
-  public function __construct($entity_type, $bundle, $view_mode = NULL) {
-    $this->entity_type = $entity_type;
-    $this->bundle = $bundle;
-    $this->view_mode = 'default';
-    $this->adminPath = field_ui_bundle_admin_path($this->entity_type, $this->bundle);
-  }
-
-  /**
    * Implements Drupal\field_ui\OverviewBase::getRegions().
    */
   public function getRegions() {
@@ -63,7 +53,7 @@ public function buildForm(array $form, array &$form_state) {
     $field_types = field_info_field_types();
     $widget_types = field_info_widget_types();
     $extra_fields = field_info_extra_fields($this->entity_type, $this->bundle, 'form');
-    $entity_form_display = entity_get_form_display($this->entity_type, $this->bundle, $this->view_mode);
+    $entity_form_display = entity_get_form_display($this->entity_type, $this->bundle, $this->mode);
 
     $form += array(
       '#entity_type' => $this->entity_type,
@@ -95,7 +85,7 @@ public function buildForm(array $form, array &$form_state) {
     // Fields.
     foreach ($instances as $name => $instance) {
       $field = field_info_field($instance['field_name']);
-      $widget_configuration = entity_get_form_display($instance['entity_type'], $instance['bundle'])->getComponent($instance['field_name']);
+      $widget_configuration = $entity_form_display->getComponent($instance['field_name']);
       $admin_field_path = $this->adminPath . '/fields/' . $instance['field_name'];
       $table[$name] = array(
         '#attributes' => array('class' => array('draggable', 'tabledrag-leaf')),
@@ -530,7 +520,7 @@ protected function validateAddExisting(array $form, array &$form_state) {
    */
   public function submitForm(array &$form, array &$form_state) {
     $form_values = $form_state['values']['fields'];
-    $entity_form_display = entity_get_form_display($this->entity_type, $this->bundle, $this->view_mode);
+    $entity_form_display = entity_get_form_display($this->entity_type, $this->bundle, $this->mode);
 
     // Collect data for 'regular' fields.
     foreach ($form['#fields'] as $field_name) {
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
index 5a76dc1..8410925 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/OverviewBase.php
@@ -29,11 +29,11 @@
   protected $bundle = '';
 
   /**
-   * The entity view mode.
+   * The entity view or form mode.
    *
    * @var string
    */
-  protected $view_mode = '';
+  protected $mode = '';
 
   /**
    * The admin path of the overview page.
@@ -49,14 +49,14 @@
    *   The entity type.
    * @param string $bundle
    *   The bundle for the entity of entity_type.
-   * @param string $view_mode
-   *   (optional) The view mode for the entity which takes a string or
+   * @param string $mode
+   *   (optional) The view or form mode for the entity which takes a string or
    *   "default".
    */
-  public function __construct($entity_type, $bundle, $view_mode = NULL) {
+  public function __construct($entity_type, $bundle, $mode = NULL) {
     $this->entity_type = $entity_type;
     $this->bundle = $bundle;
-    $this->view_mode = (isset($view_mode) ? $view_mode : 'default');
+    $this->mode = (isset($mode) ? $mode : 'default');
     $this->adminPath = field_ui_bundle_admin_path($this->entity_type, $this->bundle);
   }
 
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php b/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
index 2b36ad4..97766b5 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleStorageController.php
@@ -76,9 +76,7 @@ protected function replaceImageStyle(ImageStyle $style) {
       $instances = field_read_instances();
       // Loop through all fields searching for image fields.
       foreach ($instances as $instance) {
-        $entity_form_display = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default');
-        $widget_definition = $entity_form_display->getWidget($instance['field_name'])->getDefinition();
-        if ($widget_definition['module'] == 'image') {
+        if ($instance->getField()->type == 'image') {
           $view_modes = entity_get_view_modes($instance['entity_type']);
           $view_modes = array('default') + array_keys($view_modes);
           foreach ($view_modes as $view_mode) {
@@ -94,6 +92,7 @@ protected function replaceImageStyle(ImageStyle $style) {
                 ->save();
             }
           }
+          $entity_form_display = entity_get_form_display($instance['entity_type'], $instance['bundle'], 'default');
           $widget_configuration = $entity_form_display->getComponent($instance['field_name']);
           if ($widget_configuration['settings']['preview_image_style'] == $style->getOriginalID()) {
             $widget_options['settings']['preview_image_style'] = $style->id();
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
index 74b92ed..621f114 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
@@ -94,10 +94,8 @@ public function testEntityFormDisplayUpgrade() {
     $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
 
     // Check that the configuration entries were created.
-    $displays = array(
-      'default' => config('entity.form_display.node.article.default')->get(),
-    );
-    $this->assertTrue(!empty($displays['default']));
+    $form_display = config('entity.form_display.node.article.default')->get();
+    $this->assertTrue(!empty($form_display));
 
     // Check that manifest entries for the 'article' node type were correctly
     // created.
@@ -107,29 +105,25 @@ public function testEntityFormDisplayUpgrade() {
 
     // Check that the 'body' field is configured as expected.
     $expected = array(
-      'default' => array(
-        'type' => 'text_textarea_with_summary',
-        'weight' => -4,
-        'settings' => array(
-          'rows' => '20',
-          'summary_rows' => '5',
-        ),
+      'type' => 'text_textarea_with_summary',
+      'weight' => -4,
+      'settings' => array(
+        'rows' => '20',
+        'summary_rows' => '5',
       ),
     );
-    $this->assertEqual($displays['default']['content']['body'], $expected['default']);
+    $this->assertEqual($form_display['content']['body'], $expected);
 
     // Check that the display key in the instance data was removed.
     $body_instance = field_info_instance('node', 'body', 'article');
-    $this->assertTrue(!isset($body_instance['form']));
+    $this->assertTrue(!isset($body_instance['widget']));
 
     // Check that the 'title' extra field is configured as expected.
     $expected = array(
-      'default' => array(
-        'weight' => -5,
-        'visible' => 1,
-      ),
+      'weight' => -5,
+      'visible' => 1,
     );
-    $this->assertEqual($displays['default']['content']['title'], $expected['default']);
+    $this->assertEqual($form_display['content']['title'], $expected);
   }
 
   /**
diff --git a/core/profiles/standard/config/field.instance.node.article.field_image.yml b/core/profiles/standard/config/field.instance.node.article.field_image.yml
index 3412036..98bd0e3 100644
--- a/core/profiles/standard/config/field.instance.node.article.field_image.yml
+++ b/core/profiles/standard/config/field.instance.node.article.field_image.yml
@@ -19,12 +19,5 @@ settings:
   title_field_required: 0
   default_image: 0
   user_register_form: false
-widget:
-  type: image_image
-  settings:
-    progress_indicator: throbber
-    preview_image_style: thumbnail
-  weight: -1
-  module: image
 status: 1
 langcode: und
diff --git a/core/profiles/standard/config/field.instance.node.article.field_tags.yml b/core/profiles/standard/config/field.instance.node.article.field_tags.yml
index bbca298..bb51b39 100644
--- a/core/profiles/standard/config/field.instance.node.article.field_tags.yml
+++ b/core/profiles/standard/config/field.instance.node.article.field_tags.yml
@@ -9,13 +9,5 @@ default_value: {  }
 default_value_function: ''
 settings:
   user_register_form: false
-widget:
-  type: taxonomy_autocomplete
-  weight: -4
-  settings:
-    size: '60'
-    autocomplete_path: taxonomy/autocomplete
-    placeholder: ''
-  module: taxonomy
 status: 1
 langcode: und