Revert "Merge pull request #1 from Grinch/master"

This reverts commit b697990a31ae03a06254dfca252005d469d22a48, reversing
changes made to 7c02b48f50ad4bb8d416512e13f6075a7f12716b.