diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml
index a30e32b..71b7ccd 100644
--- a/core/config/schema/core.entity.schema.yml
+++ b/core/config/schema/core.entity.schema.yml
@@ -171,17 +171,6 @@ field.widget.settings.uri:
       type: label
       label: 'Placeholder'
 
-field.widget.settings.uri:
-  type: mapping
-  label: 'URI field'
-  mapping:
-    size:
-      type: integer
-      label: 'Size of URI field'
-    placeholder:
-      type: label
-      label: 'Placeholder'
-
 field.widget.settings.email_default:
   type: mapping
   label: 'Email field display format settings'
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 5f9a42b..1eaa0d1 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -353,11 +353,7 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
 
         if (!empty($schema['indexes'])) {
           foreach ($schema['indexes'] as $name => $specifier) {
-            // Check if the index exists because it might already have been
-            // created as part of the earlier entity type update event.
-            if (!$schema_handler->indexExists($table_name, $name)) {
-              $schema_handler->addIndex($table_name, $name, $specifier, $schema);
-            }
+            $schema_handler->addIndex($table_name, $name, $specifier, $schema);
           }
         }
         if (!empty($schema['unique keys'])) {
@@ -1331,14 +1327,8 @@ protected function updateDedicatedTableSchema(FieldStorageDefinitionInterface $s
               $real_columns[] = $table_mapping->getFieldColumnName($storage_definition, $column_name);
             }
           }
-          // Check if the index exists because it might already have been
-          // created as part of the earlier entity type update event.
-          if (!$this->database->schema()->indexExists($table, $real_name)) {
-            $this->database->schema()->addIndex($table, $real_name, $real_columns, $actual_schema[$table]);
-          }
-          if (!$this->database->schema()->indexExists($revision_table, $real_name)) {
-            $this->database->schema()->addIndex($revision_table, $real_name, $real_columns, $actual_schema[$revision_table]);
-          }
+          $this->database->schema()->addIndex($table, $real_name, $real_columns, $actual_schema[$table]);
+          $this->database->schema()->addIndex($revision_table, $real_name, $real_columns, $actual_schema[$revision_table]);
         }
       }
       $this->saveFieldSchemaData($storage_definition, $this->getDedicatedTableSchema($storage_definition));
@@ -1429,11 +1419,7 @@ protected function updateSharedTableSchema(FieldStorageDefinitionInterface $stor
             // Create new indexes and unique keys.
             if (!empty($schema[$table_name]['indexes'])) {
               foreach ($schema[$table_name]['indexes'] as $name => $specifier) {
-                // Check if the index exists because it might already have been
-                // created as part of the earlier entity type update event.
-                if (!$schema_handler->indexExists($table_name, $name)) {
-                  $schema_handler->addIndex($table_name, $name, $specifier, $schema[$table_name]);
-                }
+                $schema_handler->addIndex($table_name, $name, $specifier, $schema[$table_name]);
               }
             }
             if (!empty($schema[$table_name]['unique keys'])) {