Make the patch work without node_grants

#3830