Last bit of grunt-4 porting