diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index ba02ebf..c5d5853 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -877,10 +877,6 @@ protected function initializeDataTable(ContentEntityTypeInterface $entity_type)
     $entity_type_id = $entity_type->id();
     $id_key = $entity_type->getKey('id');
 
-    if (!$entity_type->getKey('langcode')) {
-      throw new \Exception(String::format('Missing langcode entity key for entity type "@entity_type_id"', array('@entity_type_id' => $entity_type->getKey('langcode'))));
-    }
-
     $schema = array(
       'description' => "The data table for $entity_type_id entities.",
       'primary key' => array($id_key, $entity_type->getKey('langcode')),
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index 68b99f8..ce6cf27 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -554,7 +554,7 @@ public function testGetBaseFieldDefinitionsWithCaching() {
    * @covers ::getFieldDefinitions
    */
   public function testGetFieldDefinitionsWithCaching() {
-    $field_definition = $this->setUpEntityWithFieldDefinition(FALSE, 'id', 0);
+    $field_definition = $this->setUpEntityWithFieldDefinition(FALSE, 'id');
 
     $expected = array('id' => $field_definition);
 
@@ -594,7 +594,7 @@ public function testGetFieldDefinitionsWithCaching() {
    * @covers ::getFieldStorageDefinitions
    */
   public function testGetFieldStorageDefinitionsWithCaching() {
-    $field_definition = $this->setUpEntityWithFieldDefinition(TRUE, 'id', 0);
+    $field_definition = $this->setUpEntityWithFieldDefinition(TRUE, 'id');
     $field_storage_definition = $this->getMock('\Drupal\Core\Field\FieldStorageDefinitionInterface');
     $field_storage_definition->expects($this->any())
       ->method('getName')