Update for https://github.com/rust-lang/rust/pull/16453