Revert "Merge pull request #20158 from yzen/bug-1018214"

This reverts commit fe4842aa5af8bdb432c10ad10b41d2c97a2894bc, reversing
changes made to ac161f044999a36d7e4b1587953c8b7d6e5c33b7.