Revert, and merge.