Refs: https://github.com/rust-lang/rust/pull/68140 @topecongiro - feel free to assign me, will have a PR for this within the next day or two