Hopefully a fix for semi-random datastores being used for machine deployments, refs #1518