diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 5727129..7338875 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -480,7 +480,7 @@ function node_uninstall() {
   variable_del('node_rank_recent');
 
   // Delete remaining general module variables.
-  variable_del('node_access_needs_rebuild');
+  state()->delete('node_access_needs_rebuild');
   variable_del('node_admin_theme');
   variable_del('node_cron_last');
   variable_del('node_recent_block_count');
@@ -601,6 +601,15 @@ function node_update_8004() {
 }
 
 /**
+ * Moves node_access_needs_rebuild from variable to state.
+ *
+ * @ingroup state_upgrade
+ */
+function node_update_8005() {
+  state()->set('node_access_needs_rebuild', update_variable_get('node_access_needs_rebuild', FALSE));
+}
+
+/**
  * @} End of "addtogroup updates-7.x-to-8.x"
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 8a41887..ba8ea7d 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -3470,13 +3470,13 @@ function _node_access_write_grants(Node $node, $grants, $realm = NULL, $delete =
  */
 function node_access_needs_rebuild($rebuild = NULL) {
   if (!isset($rebuild)) {
-    return variable_get('node_access_needs_rebuild', FALSE);
+    return state()->get('node_access_needs_rebuild') ?: FALSE;
   }
   elseif ($rebuild) {
-    variable_set('node_access_needs_rebuild', TRUE);
+    state()->set('node_access_needs_rebuild', TRUE);
   }
   else {
-    variable_del('node_access_needs_rebuild');
+    state()->delete('node_access_needs_rebuild');
   }
 }