Revert "Merge pull request #21388 from gasolin/issue-951538"

This reverts commit 6c2a1b999251900aed67dff4ec44f9c4cd3165a8, reversing
changes made to 43c54f758c614160b0183429021ea974bc988905.