#20531: Revert e20f98a8ed71, the 3.4 version of the #19063 fix.
5 files changed