diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index f116f7e..8d96da8 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -299,7 +299,7 @@ protected function preSaveNew(EntityStorageInterface $storage) {
 
     // Disallow reserved field names.
     $disallowed_field_names = array_keys($entity_manager->getBaseFieldDefinitions($this->getTargetEntityTypeId()));
-      if (in_array($this->getName(), $disallowed_field_names)) {
+    if (in_array($this->getName(), $disallowed_field_names)) {
       throw new FieldException(String::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->getName(), '%type' => $this->getTargetEntityTypeId())));
     }
 
@@ -310,10 +310,6 @@ protected function preSaveNew(EntityStorageInterface $storage) {
     }
     $this->module = $field_type['provider'];
 
-    // Make sure all settings are present, so that a complete field
-    // definition is passed to the various hooks and written to config.
-    $this->settings += $field_type_manager->getDefaultStorageSettings($this->getType());
-
     // Notify the entity manager.
     $entity_manager->onFieldStorageDefinitionCreate($this);
   }