Switch a couple things to their pre-berserk configuration