Issue #3347291: Combine field storage and field instance forms

core/lib/Drupal/Core/Field/FieldConfigBase.php

@@ -6,7 +6,6 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
-use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for configurable field definitions.
@@ -475,11 +474,6 @@ public function __sleep() {
     // recalculated.
     unset($properties['itemDefinition'], $properties['original']);
 
-    // Field storage can be recalculated if it's not new.
-    if (array_key_exists('fieldStorage', $properties) && $properties['fieldStorage'] instanceof FieldStorageConfig && !$properties['fieldStorage']->isNew()) {
-      unset($properties['fieldStorage']);
-    }
-
     return array_keys($properties);
   }