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

This reverts commit c0f57320fb366e3fffdafb055bd6fa799bdfa9d8, reversing
changes made to b4b59d9f94fecee97e182cf29e67e4465848a337.