Revert grenade changes from v1.8

Top