Update for mozilla/rust#10697.