Moving some of the 'backwards compat' stuff into the grunt task