reverted:
--- b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -569,11 +569,9 @@
   protected function doLoadRevisionFieldItems($revision_id) {
     $revision = NULL;
 
+    // Build and execute the query.
+    $query_result = $this->buildQuery(array(), $revision_id)->execute();
+    $records = $query_result->fetchAllAssoc($this->idKey);
-    if ($revision_id) {
-      // Build and execute the query.
-      $query_result = $this->buildQuery(array(), $revision_id)->execute();
-      $records = $query_result->fetchAllAssoc($this->idKey);
-    }
 
     if (!empty($records)) {
       // Convert the raw records to entity objects.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -216,7 +216,7 @@ public function finalizePurge(FieldStorageDefinitionInterface $storage_definitio
    * {@inheritdoc}
    */
   public function loadRevision($revision_id) {
-    $revision = $this->doLoadRevisionFieldItems($revision_id);
+    $revision = $revision_id ? $this->doLoadRevisionFieldItems($revision_id) : NULL;
 
     if ($revision) {
       $entities = [$revision->id() => $revision];