Comment From: wilkinsona

This may be addressed by fixing #25135.

Comment From: wilkinsona

Applying the changes that had already been made for #25135 to the 2.5.x branch seems to have done the trick.