Revert "Merge pull request #15 from gaich/patch-2"

This reverts commit a36084c6f6bb4d0cdc667e906277d95c523ae0b0, reversing
changes made to 0a948e5ace47fd8524c6467af2dcb03d46449d44.