diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
index cded360b5f6..b39d90076ed 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
@@ -170,11 +170,7 @@ class ContentEntityDatabaseStorage extends ContentEntityStorageBase implements S
       $this->revisionKey = $this->entityType->getKey('revision') ?: 'revision_id';
       $this->revisionTable = $this->entityType->getRevisionTable() ?: $this->entityTypeId . '_revision';
     }
-    // @todo Remove the data table check once all entity types are using
-    // entity query and we have a views data controller. See:
-    // - https://drupal.org/node/2068325
-    // - https://drupal.org/node/1740492
-    $translatable = $this->entityType->isTranslatable() && $this->entityType->getDataTable();
+    $translatable = $this->entityType->isTranslatable();
     if ($translatable) {
       $this->dataTable = $this->entityType->getDataTable() ?: $this->entityTypeId . '_field_data';
       $this->langcodeKey = $this->entityType->getKey('langcode') ?: 'langcode';
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
index 64370377b69..5d49c11a591 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
@@ -202,7 +202,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
     $this->entityType->expects($this->once())
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(2))
+    $this->entityType->expects($this->exactly(1))
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
 
@@ -232,7 +232,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
     $this->entityType->expects($this->once())
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(2))
+    $this->entityType->expects($this->exactly(1))
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->once())
@@ -602,7 +602,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
     $this->entityType->expects($this->exactly(2))
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
@@ -664,7 +664,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
     $this->entityType->expects($this->exactly(2))
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
@@ -729,7 +729,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
     $this->entityType->expects($this->exactly(2))
       ->method('isTranslatable')
       ->will($this->returnValue(TRUE));
-    $this->entityType->expects($this->exactly(3))
+    $this->entityType->expects($this->exactly(2))
       ->method('getDataTable')
       ->will($this->returnValue('entity_test_field_data'));
     $this->entityType->expects($this->any())
@@ -861,7 +861,7 @@ class ContentEntityDatabaseStorageTest extends UnitTestCase {
       $this->entityType->expects($this->exactly(2))
         ->method('isTranslatable')
         ->will($this->returnValue(TRUE));
-      $this->entityType->expects($this->exactly(3))
+      $this->entityType->expects($this->exactly(2))
         ->method('getDataTable')
         ->will($this->returnValue('entity_test_field_data'));
       $this->entityType->expects($this->any())