Yes, I am. I left `stable` alone on the first pass, then realized it could benefit from this patch too, but forgot to add it, and finally I misunderstood your point.

Actually, I really wanted to make the patch block here based on the new #21648, because patches without checksums make me unconfortable, but because it makes it simpler to conditionalize individual patches.