Revert "Merge pull request #4 from fourk/master"

This reverts commit c08b91781c1f7257eeece7c9dbd64dff92b56601, reversing
changes made to 323e936837dca20d564571c5bdd3c98d9f61edf9.