Revert some changes to avert conflict