backport the fix for bug #67739