Fixes gh-18583

Comment From: philwebb

Thanks for the PR @wesuga. This is now in 2.3.x, 2.4.x and master.