Fixes: gh-22381

Comment From: sbrannen

This has been merged into master in a0c00362c3ba279494fec86ed6e403d829e10bee and revised in a6bede22c113e69206c13735dbf820c7cb043e2e.

Thanks