Revert "Merge pull request #18154 from gasolin/issue-994493"

This reverts commit bbba09c732c35d9434ecb04d5e2e41d05511f4d9, reversing
changes made to 669de1b3f93a0a130d272e6de6edba4d9f1e4ca5.