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?
@WillAyd what was wrong is that the PR was not targetting the 0.24.x branch but master (I changed it now, but before it was showing a huge number of commits). 
So when you crate a PR, you can choose which branch you want to merge it in. Or after creating, if you do the "Edit" button next to the title, you can still change it.

But so now with targetting 0.24.x branch, this looks fine.

I typically use `git cherry-pick -x <sha>` @jorisvandenbossche thanks yea that did look off so thanks for fixing and clarifying.  @WillAyd this should be merged or closed? @jreback I think OK to merge Thanks!