Co-authored-by: Matt Martz <matt@sivel.net> Fixes #71920 (cherry picked from commit 4197666179)
4197666179