Revert "Merge pull request #8998 from macjohnny/master"

This reverts commit 482eded8b31b257dfed7761c7cb43f35ddcd3408, reversing
changes made to 354cace14ae01e7ff34af3c8a4a3335b89596da3.