Rolled back more Grunt changes to duplicate Kelly's successful (and magical) deploy.