Thanks Anssi and Marc Tamlyn for reviewing. Fixes #19803. 0560bfb705687c831e2769b1202706e2ceb1f7a7 from master.