Revert grunt upgrade due to mismatches