Revert "Merge pull request #59 from jallits/master"

This reverts commit 1c6b74de32a9c113c56cc2aa4195401a3c8d1014, reversing
changes made to 3c53047d1cceeab786f3f55612e691490e6ade4e.