Revert stuff I broke