Fix issues after r54561 which avoided use of the 7z wrapper.