Revert 6376db4..0b13dda

This rolls back to commit 6376db497229bfcc954b910759b1214a04ae8511.
Cimmiting latest grunt commands