Revert the previous hacks