Note: this doesn't actually fix #43090. (cherry picked from commit becac651e8) (cherry picked from commit ce78690029)
becac651e8
ce78690029