revert then patch