Auto backport of pr 25701 on 0.24.x
@TomAugspurger @jorisvandenbossche @jreback want to double check I did this right. I didn't use the -m flag during the cherry-pick process as that was causing failures

0.24.3 at this point?