diff --git a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php
index aca491d..cfbbff9 100644
--- a/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php
+++ b/core/modules/node/lib/Drupal/node/Access/NodeRevisionAccessCheck.php
@@ -139,7 +139,7 @@ public function checkAccess(NodeInterface $node, $op = 'view', AccountInterface
       // different revisions so there is no need for a separate database check.
       // Also, if you try to revert to or delete the default revision, that's
       // not good.
-      if ($node->isDefaultRevision() && ($this->connection->query('SELECT COUNT(*) FROM {node_field_revision} WHERE nid = :nid AND default_langcode = 1', array(':nid' => $node->id()))->fetchField() == 1 || $op == 'update' || $op == 'delete')) {
+      if ($node->isDefaultRevision() && ($this->nodeStorage->revisionCount($node->id()) == 1 || $op == 'update' || $op == 'delete')) {
         $this->access[$cid] = FALSE;
       }
       elseif (user_access('administer nodes', $account)) {
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
index c3ccc3c..6b59a21 100644
--- a/core/modules/node/lib/Drupal/node/NodeStorageController.php
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -30,6 +30,19 @@ public function create(array $values) {
   }
 
   /**
+   * Return the count of revisions for a given node.
+   *
+   * @param integer $node_id
+   *   The node id to query.
+   *
+   * @return integer
+   *   Count of revisions found.
+   */
+  public function revisionCount($node_id) {
+    return $this->database->query('SELECT COUNT(*) FROM {node_field_revision} WHERE nid = :nid AND default_langcode = 1', array(':nid' => $node_id))->fetchField();
+  }
+
+  /**
    * Overrides Drupal\Core\Entity\DatabaseStorageControllerNG::attachLoad().
    */
   protected function attachLoad(&$queried_entities, $load_revision = FALSE) {