Revert "Merge pull request #18927 from rnowm/1005802"

This reverts commit 7cceb7de02a72b8ffecbb0844caf5cac17e0b66b, reversing
changes made to 1e42ad6f307f69ad269dd5baba935cd7fc82b703.