Revert some changes that might block the merge