Backport #27582 to beta

[pnkfelix]

#27582

Needs to be back ported

(I'm on a mobile device, and I forgot our protocol for nominating back ports. Just wanted to ensure this doesn't fall through the cracks.)

[alexcrichton]

I've tagged #27582 with beta-nominated and T-compiler, so this should come up as part of normal triage now (closing in favor of that process)