Backout some changes we no longer need