Revert some, add some to revert later