diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php
index 9111071..ccd1cb6 100644
--- a/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -285,7 +285,7 @@ public function generateSampleItems($count = 1) {
     $field_definition = $this->getFieldDefinition();
     $field_type_class = \Drupal::service('plugin.manager.field.field_type')->getPluginClass($field_definition->getType());
     for ($delta=0; $delta < $count; $delta++) {
-      $values[$delta] = $field_type_class::generateSampleValue($field_definition, $this->getEntity());
+      $values[$delta] = $field_type_class::generateSampleValue($field_definition);
     }
     $this->setValue($values);
   }
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index f610f99..f90af49 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -66,14 +66,9 @@ public function getSettableOptions(AccountInterface $account = NULL) {
   /**
    * {@inheritdoc}
    */
-// @todo Implement this once https://www.drupal.org/node/2238085 lands.
-//  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
-//    $field_name = $field_definition->getName();
-//    if ($allowed = $entity->$field_name->first()->getPossibleValues()) {
-//      $values['value'] = array_rand(array_flip($allowed));
-//      return $values;
-//    }
-//  }
+   public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
+     // @todo Implement this once https://www.drupal.org/node/2238085 lands.
+   }
 
   /**
    * {@inheritdoc}