Revert e88a400..629014f

This rolls back to commit e88a400a6698b80feda73b2a542915618435aa1f.
Grunt-ify