See discussion near the end of #20673. It might be possible to improve #20740 some more if they weren't (though it already improves the situation, so no need to block it I think).
Recording it mostly so I don't forget it, and in case someone jumps in.
CC @novalisek