revert some changes from old master