Reverted a bunch of stuff