Revert parts of #66405.#67471

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

nnethercote:revert-66405nnethercote/rust:revert-66405Copy head branch name to clipboard