Revert "Merge pull request #104 from alexko/master"

This reverts commit 2385ebd291359cf59086608e60a000cc8a92cf03, reversing
changes made to ec16c4f514d71237196acff36c714fb279b67fb1.