Reverting a bunch of insanity