Not done in #48052 because of a 10% regression in this artificial test-case: https://github.com/rust-lang/rust/pull/48052#issuecomment-363954747.