Revert "Merge pull request #8875 from gaye/bug-830180"

This reverts commit f8621db86ae6380bca20f980a4c32403c1a18638, reversing
changes made to 10627f87346ffce9cff80e51753d35b26f15763b.
Merge pull request #9464 from gaye/bug-864398

Revert "Merge pull request #8875 from gaye/bug-830180"