Make the patch work without node_grants
Merge pull request #4033 from openscholar/3830-hotfix3

Make the patch work without node_grants