Reload grains with modules for states

Fix for #15125.