Revert some changes from merge.