Switch to using grains. Remove accidental debug.
Merge pull request #4338 from jasonrm/minor-cmdmod-darwin

Switch to using grains. Remove accidental debug.