Revert "Merge pull request #1061 from icylace/master"

This reverts commit 6c820d8f74d5caf1bcfc6d15da007ff6ca52bb26, reversing
changes made to 22f49a05fe5063ac77c5753cf0cf1009fc549b54.