Revert to upstream Gruntfile and package.json