backport fix from r87741 related to the issue6643 fix in r87727.
1 file changed