diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index e7109e1b75d82470baf60fb834fa7e3867f3ee28..6fb4ddfd1a7c944af44b5696003d90bc207ae0f4 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -1633,9 +1633,7 @@ protected function getDedicatedTableSchema(FieldStorageDefinitionInterface $stor
       'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
       'indexes' => array(
         'bundle' => array('bundle'),
-        'deleted' => array('deleted'),
         'revision_id' => array('revision_id'),
-        'langcode' => array('langcode'),
       ),
     );
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 0e97d46afda28ce6dc7533fa47d9c1ac1ff583c5..08f73cb4d08f0cab19e3f4e4b444e754b4bdc915 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -854,9 +854,7 @@ public function testDedicatedTableSchema() {
         'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
         'indexes' => array(
           'bundle' => array('bundle'),
-          'deleted' => array('deleted'),
           'revision_id' => array('revision_id'),
-          'langcode' => array('langcode'),
         ),
         'foreign keys' => array(
           $field_name . '_color' => array(
@@ -1001,9 +999,7 @@ public function testDedicatedTableSchemaForEntityWithStringIdentifier() {
         'primary key' => array('entity_id', 'deleted', 'delta', 'langcode'),
         'indexes' => array(
           'bundle' => array('bundle'),
-          'deleted' => array('deleted'),
           'revision_id' => array('revision_id'),
-          'langcode' => array('langcode'),
         ),
         'foreign keys' => array(
           $field_name . '_color' => array(