Revert some merge changes.