Refs #3631: fix the same patch issue that we had on the v1.6 branch
(minor differences from the trunk).