Forward port of issue #12158 to 5.8.x.

Comment From: jzheaux

Stray issue created by forward-port git hook via a local cherry-pick