Revert "Merge pull request #14659 from gasolin/issue-950080"

This reverts commit 5028d298c3be4effa75147703b3148883982038e, reversing
changes made to 0ef52554acf8cc115e40a95b2eab0117df3dff45.
Merge pull request #14905 from gaye/bug-952553

Revert "Merge pull request #14659 from gasolin/issue-950080"