See gh-25030.
Comment From: sbrannen
Thanks so much for picking this up!
We'll review it and get it merged soon.
Comment From: sbrannen
This has been merged into 5.2.x in 7fbdc3ad11b7cada0234d837b9a2acc81e12edd7 and revised in e1b2cafb335e3a98ce807cd8fdc2cd28c7f1ee17 (and forward merged into master).
Thanks again!