Re: Backporting fix for #199981 to 4.19.y?