Merge pull request #3169 from lambdageek/fix-regression-70561