Revert "Merge pull request #110 from andr3jx/master"

This reverts commit f44afd5d10f80a9e559c549fc4bb7eceeb79d38e, reversing
changes made to 78971cca9276692b996340d64ee600ee85e0ffa7.