Revert that last commit (mostly)