Revert "Merge pull request #18449 from gasolin/issue-993832"

This reverts commit 9ce3fa58b57c5665a99dce2003e7b03a0b284770, reversing
changes made to a79a34f8114f5804f363685d717734c383f0d8ab.