Revert "Reload grains with modules for states"

Reverts saltstack/salt#15136

The test failures we were seeing turn out to be legit and potentially very bad. We will need to investigate this further