We need to back port the fix for #19464 to 2.2.x.