Comment From: philwebb

Closing in favor of PR #25006. Thanks @dreis2211!