Forward port of issue #42375 to 3.3.x.

Comment From: wilkinsona

The change didn't help and has been reverted in 391b643d8daa4fce913445eccebe99e2dc1f85ee.