Revert "Merge pull request #27039 from snowmantw/bug1116091"

This reverts commit 8f9412ce170991067a1a10cfaa4cba64d2034c33, reversing
changes made to dd23a7b904dd93fdeb399b34822d389d7b3ddc3b.