Reverted a mod that was already covered earlier
Merge branch 'vanilla_improvements' of github.com:datacratic/StarCluster into datacratic_dev