diff -u b/core/modules/image/image.module b/core/modules/image/image.module
--- b/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -361,7 +361,7 @@
   $field = FALSE;
   $entity_type_id = $entity->getEntityTypeId();
   if ($entity_type_id == 'field_instance_config') {
-    $field = $entity->getField();
+    $field = $entity->getFieldStorageDefinition();
     $default_settings = \Drupal::service('plugin.manager.field.field_type')->getDefaultInstanceSettings('image');
   }
   elseif ($entity_type_id == 'field_config') {
only in patch2:
unchanged:
--- a/core/modules/field/src/FieldInstanceConfigAccessController.php
+++ b/core/modules/field/src/FieldInstanceConfigAccessController.php
@@ -20,7 +20,7 @@ class FieldInstanceConfigAccessController extends EntityAccessController {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
-    if ($operation == 'delete' && $entity->getField()->isLocked()) {
+    if ($operation == 'delete' && $entity->getFieldStorageDefinition()->isLocked()) {
       return FALSE;
     }
     return $account->hasPermission('administer ' . $entity->entity_type . ' fields');
only in patch2:
unchanged:
--- a/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php
+++ b/core/modules/field_ui/src/Form/FieldInstanceConfigDeleteForm.php
@@ -68,7 +68,7 @@ public function getCancelRoute() {
    * {@inheritdoc}
    */
   public function submit(array $form, array &$form_state) {
-    $field = $this->entity->getField();
+    $field = $this->entity->getFieldStorageDefinition();
     $bundles = entity_get_bundles();
     $bundle_label = $bundles[$this->entity->entity_type][$this->entity->bundle]['label'];
 
only in patch2:
unchanged:
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php
@@ -29,7 +29,7 @@ public function prepareView(array $entities_items) {
         // If we are dealing with a configurable field, look in both
         // instance-level and field-level settings.
         if (empty($default_image['fid']) && $this->fieldDefinition instanceof FieldInstanceConfigInterface) {
-          $default_image = $this->fieldDefinition->getField()->getSetting('default_image');
+          $default_image = $this->fieldDefinition->getFieldStorageDefinition()->getSetting('default_image');
         }
 
         if (!empty($default_image['fid']) && ($file = file_load($default_image['fid']))) {
only in patch2:
unchanged:
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -158,7 +158,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) {
     // We need the field-level 'default_image' setting, and $this->getSettings()
     // will only provide the instance-level one, so we need to explicitly fetch
     // the field.
-    $settings = $this->getFieldDefinition()->getField()->getSettings();
+    $settings = $this->getFieldDefinition()->getFieldStorageDefinition()->getSettings();
 
     $scheme_options = array();
     foreach (file_get_stream_wrappers(STREAM_WRAPPERS_WRITE_VISIBLE) as $scheme => $stream_wrapper) {