diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Type/ConfigurableEntityReferenceItem.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Type/ConfigurableEntityReferenceItem.php
index 16ba508..f32b903 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Type/ConfigurableEntityReferenceItem.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Type/ConfigurableEntityReferenceItem.php
@@ -8,10 +8,8 @@
 namespace Drupal\entity_reference\Type;
 
 use Drupal\Core\Entity\Field\Type\EntityReferenceItem;
-use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\field\Plugin\Type\FieldType\ConfigFieldItemInterface;
 use Drupal\field\Plugin\Core\Entity\Field;
-use Drupal\field\Field as FieldAPI;
 
 /**
  * Defines the 'entity_reference_configurable' entity field item.
@@ -43,7 +41,7 @@ class ConfigurableEntityReferenceItem extends EntityReferenceItem implements Con
   /**
    * Returns the field instance definition.
    *
-   * Duplicated from \Drupal\field\Plugin\Type\FieldType\ConfigFieldItemBase,
+   * Copied from \Drupal\field\Plugin\Type\FieldType\ConfigFieldItemBase,
    * since we cannot extend it.
    *
    * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
@@ -91,7 +89,7 @@ public function getPropertyDefinitions() {
   /**
    * {@inheritdoc}
    *
-   * Duplicated from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
+   * Copied from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
    * since we cannot extend it.
    */
   public static function schema(Field $field) {
@@ -122,33 +120,35 @@ public function isEmpty() {
   /**
    * {@inheritdoc}
    *
-   * Duplicated from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
+   * Copied from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
    * since we cannot extend it.
    */
-  public function settingsForm(array $form, array &$form_state, $has_data) {
+  public function settingsForm(array $form, array &$form_state) {
     if ($callback = $this->getLegacyCallback('settings_form')) {
       // hook_field_settings_form() used to receive the $instance (not actually
       // needed), and the value of field_has_data().
-      return $callback($this->getInstance()->getField(), $this->getInstance(), $has_data);
+      return $callback($this->getInstance()->getField(), $this->getInstance(), $this->getInstance()->getField()->hasData());
     }
+    return array();
   }
 
   /**
    * {@inheritdoc}
    *
-   * Duplicated from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
+   * Copied from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
    * since we cannot extend it.
    */
   public function instanceSettingsForm(array $form, array &$form_state) {
     if ($callback = $this->getLegacyCallback('instance_settings_form')) {
       return $callback($this->getInstance()->getField(), $this->getInstance(), $form_state);
     }
+    return array();
   }
 
   /**
    * Returns the legacy callback for a given field type "hook".
    *
-   * Duplicated from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
+   * Copied from \Drupal\field\Plugin\field\field_type\LegacyConfigFieldItem,
    * since we cannot extend it.
    *
    * @param string $hook