Forward port of issue #43649 to 3.4.x.
Comment From: wilkinsona
Closed by 51d15c7c783c576f4be80a4e834a9aad68bbff89.