Revert "Merge pull request #14156 from gasolin/issue-942704"

This reverts commit ee1bfd4a260e732264f8486cbf62197760de984a, reversing
changes made to c061ad61abd64f050c48805b27baf047e90bf084.