Revert more stuff