Backport of #25316

Comment From: sbrannen

Closed via 36682b7ad2f86c09deea5467a59347efb4e296f1 and revised in 41d71e9a7f10fd4426747b838783f72a6fddc66e.