Revert changes for less merge impact.