Revert "Merge pull request #3 from avesus/master"

This reverts commit 70f4650967699d2977def567ac06b3ece665d590, reversing
changes made to e9c31e97c0ca7863516fa6e21c9f6441453d9149.