Revert "Merge pull request #19204 from rnowm/1004710"

This reverts commit 24ba1627cf118846c938130693c592378c2589dd, reversing
changes made to ae13faeee2584fa53b055252c86a87cfe544f382.