diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index aade3e8..53d43ab 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -1213,7 +1213,7 @@ function _node_access_rebuild_batch_operation(&$context) {
     // Initiate multistep processing.
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_node'] = 0;
-    $context['sandbox']['max'] = \Drupal::entityQuery('node')->count()->execute();
+    $context['sandbox']['max'] = \Drupal::entityQuery('node')->accessCheck(FALSE)->count()->execute();
   }
 
   // Process the next 20 nodes.
diff --git a/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php b/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
index d5cca95..58d42f4 100644
--- a/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
+++ b/core/modules/node/src/Tests/NodeAccessRebuildNodeGrantsTest.php
@@ -23,7 +23,7 @@ class NodeAccessRebuildNodeGrantsTest extends NodeTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $admin_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports', 'bypass node access'));
+    $admin_user = $this->drupalCreateUser(array('administer site configuration', 'access administration pages', 'access site reports'));
     $this->drupalLogin($admin_user);
 
     $this->webUser = $this->drupalCreateUser();