Revert "Merge branch 'dzhang-master-patch-71710' into 'master'"

This reverts merge request !514 (merged), which got merged by mistake - was meant to be closed.