CMPatch revert