diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 75a99df..c8f4047 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -1866,12 +1866,12 @@ function hook_field_create_instance($instance) {
  * @param $has_data
  *   Whether any data already exists for this field.
  */
-function hook_field_update_forbid($field, $prior_field, $has_data) {
+function hook_field_update_forbid($field, $prior_field) {
   // A 'list' field stores integer keys mapped to display values. If
   // the new field will have fewer values, and any data exists for the
   // abandoned keys, the field will have no way to display them. So,
   // forbid such an update.
-  if ($has_data && count($field['settings']['allowed_values']) < count($prior_field['settings']['allowed_values'])) {
+  if ($field->hasData() && count($field['settings']['allowed_values']) < count($prior_field['settings']['allowed_values'])) {
     // Identify the keys that will be lost.
     $lost_keys = array_diff(array_keys($field['settings']['allowed_values']), array_keys($prior_field['settings']['allowed_values']));
     // If any data exist for those keys, forbid the update.
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 798d604..41605e0 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -884,43 +884,6 @@ function field_get_items(EntityInterface $entity, $field_name, $langcode = NULL)
 }
 
 /**
- * Determines whether a field has any data.
- *
- * @param $field
- *   A field structure.
- *
- * @return
- *   TRUE if the field has data for any entity; FALSE otherwise.
- */
-function field_has_data($field) {
-  $columns = array_keys($field['columns']);
-  $factory = Drupal::service('entity.query');
-  foreach ($field['bundles'] as $entity_type => $bundle) {
-    // Entity Query throws an exception if there is no base table.
-    $entity_info = entity_get_info($entity_type);
-    if (!isset($entity_info['base_table'])) {
-      continue;
-    }
-    $query = $factory->get($entity_type);
-    $group = $query->orConditionGroup();
-    foreach ($columns as $column) {
-      $group->exists($field['field_name'] . '.' . $column);
-    }
-    $result = $query
-      ->condition($group)
-      ->count()
-      ->accessCheck(FALSE)
-      ->range(0, 1)
-      ->execute();
-    if ($result) {
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
-/**
  * Determines whether the user has access to a given field.
  *
  * @param string $op
diff --git a/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php b/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php
index 6bf914f..a63132a 100644
--- a/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php
+++ b/core/modules/field/lib/Drupal/field/FieldUpdateForbiddenException.php
@@ -1,8 +1,8 @@
 <?php
 
-/*
+/**
  * @file
- * Definition of Drupal\field\FieldUpdateForbiddenException.
+ * Contains \Drupal\field\FieldUpdateForbiddenException.
  */
 
 namespace Drupal\field;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
index 872a8d0..d924cb1 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/Field.php
@@ -420,11 +420,9 @@ protected function saveUpdated() {
     // objects.
     $this->settings += $original->settings;
 
-    $has_data = field_has_data($this);
-
     // See if any module forbids the update by throwing an exception. This
     // invokes hook_field_update_forbid().
-    $module_handler->invokeAll('field_update_forbid', array($this, $original, $has_data));
+    $module_handler->invokeAll('field_update_forbid', array($this, $original));
 
     // Tell the storage engine to update the field by invoking the
     // hook_field_storage_update_field(). The storage engine can reject the
@@ -633,4 +631,39 @@ public static function getReservedColumns() {
     return array('deleted');
   }
 
+  /**
+   * Determines whether a field has any data.
+   *
+   * @return
+   *   TRUE if the field has data for any entity; FALSE otherwise.
+   */
+  public function hasData() {
+    $storage_details = $this->getStorageDetails();
+    $columns = array_keys($storage_details['columns']);
+    $factory = Drupal::service('entity.query');
+    foreach ($this->getBundles as $entity_type => $bundle) {
+      // Entity Query throws an exception if there is no base table.
+      $entity_info = entity_get_info($entity_type);
+      if (!isset($entity_info['base_table'])) {
+        continue;
+      }
+      $query = $factory->get($entity_type);
+      $group = $query->orConditionGroup();
+      foreach ($columns as $column) {
+        $group->exists($field['field_name'] . '.' . $column);
+      }
+      $result = $query
+        ->condition($group)
+        ->count()
+        ->accessCheck(FALSE)
+        ->range(0, 1)
+        ->execute();
+      if ($result) {
+        return TRUE;
+      }
+    }
+
+    return FALSE;
+  }
+
 }
diff --git a/core/modules/field/tests/modules/field_test/field_test.field.inc b/core/modules/field/tests/modules/field_test/field_test.field.inc
index d2f4a94..1b2a901 100644
--- a/core/modules/field/tests/modules/field_test/field_test.field.inc
+++ b/core/modules/field/tests/modules/field_test/field_test.field.inc
@@ -63,7 +63,7 @@ function field_test_field_widget_info_alter(&$info) {
 /**
  * Implements hook_field_update_forbid().
  */
-function field_test_field_update_forbid($field, $prior_field, $has_data) {
+function field_test_field_update_forbid($field, $prior_field) {
   if ($field['type'] == 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) {
     throw new FieldException("field_test 'unchangeable' setting cannot be changed'");
   }
diff --git a/core/modules/field_sql_storage/field_sql_storage.module b/core/modules/field_sql_storage/field_sql_storage.module
index dcbe476..85a1287 100644
--- a/core/modules/field_sql_storage/field_sql_storage.module
+++ b/core/modules/field_sql_storage/field_sql_storage.module
@@ -266,8 +266,8 @@ function field_sql_storage_field_create_field($field) {
  * Forbids any field update that changes column definitions if there is any
  * data.
  */
-function field_sql_storage_field_update_forbid($field, $prior_field, $has_data) {
-  if ($has_data && $field['columns'] != $prior_field['columns']) {
+function field_sql_storage_field_update_forbid($field, $prior_field) {
+  if ($field->hasData() && $field['columns'] != $prior_field['columns']) {
     throw new FieldUpdateForbiddenException("field_sql_storage cannot change the schema for an existing field with data.");
   }
 }
diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php
index 81a5f3b..b3bf03e 100644
--- a/core/modules/field_ui/field_ui.api.php
+++ b/core/modules/field_ui/field_ui.api.php
@@ -29,13 +29,11 @@
  *   The field structure being configured.
  * @param $instance
  *   The instance structure being configured.
- * @param $has_data
- *   TRUE if the field already has data, FALSE if not.
  *
  * @return
  *   The form definition for the field settings.
  */
-function hook_field_settings_form($field, $instance, $has_data) {
+function hook_field_settings_form($field, $instance) {
   $settings = $field['settings'];
   $form['max_length'] = array(
     '#type' => 'number',
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index 0d8ec00..b735d28 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -79,7 +79,7 @@ function options_field_settings_form($field, $instance, $has_data) {
         '#default_value' => options_allowed_values_string($settings['allowed_values']),
         '#rows' => 10,
         '#element_validate' => array('options_field_settings_form_validate_allowed_values'),
-        '#field_has_data' => $has_data,
+        '#field_has_data' => $field->hasData(),
         '#field' => $field,
         '#field_type' => $field['type'],
         '#access' => empty($settings['allowed_values_function']),
@@ -360,8 +360,8 @@ function options_allowed_values_string($values) {
 /**
  * Implements hook_field_update_forbid().
  */
-function options_field_update_forbid($field, $prior_field, $has_data) {
-  if ($field['module'] == 'options' && $has_data) {
+function options_field_update_forbid($field, $prior_field) {
+  if ($field['module'] == 'options' && $field->hasData()) {
     // Forbid any update that removes allowed values with actual data.
     $lost_keys = array_diff(array_keys($prior_field['settings']['allowed_values']), array_keys($field['settings']['allowed_values']));
     if (_options_values_in_use($field, $lost_keys)) {
diff --git a/core/modules/translation_entity/translation_entity.admin.inc b/core/modules/translation_entity/translation_entity.admin.inc
index dd7874c..7b25917 100644
--- a/core/modules/translation_entity/translation_entity.admin.inc
+++ b/core/modules/translation_entity/translation_entity.admin.inc
@@ -346,7 +346,7 @@ function _translation_entity_update_field_translatability($settings) {
       $field_operations = array(
         array('translation_entity_translatable_switch', array($translatable, $field_name)),
       );
-      if (field_has_data($field)) {
+      if ($field->hasData()) {
         $field_operations[] = array('translation_entity_translatable_batch', array($translatable, $field_name));
         $field_operations = $translatable ? $field_operations : array_reverse($field_operations);
       }
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index 6f6c740..9f78d89 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -810,7 +810,7 @@ function translation_entity_form_field_ui_field_edit_form_alter(array &$form, ar
   $translatable = $field['translatable'];
   $label = t('Field translation');
 
-  if (field_has_data($field)) {
+  if ($field->hasData()) {
     $form['field']['translatable'] = array(
       '#type' => 'item',
       '#title' => $label,