Fixes #6040: Don't have a global pending state by node that overrides all the rules when we update one rules