Revert so many bugged commits