Revert some more stuff