Revert "Merge pull request #29 from basus/master"

This reverts commit 2b44acd52ea52c6b311e61f3e2f13bec2780c1d1, reversing
changes made to b9fffd04aa7304baaff5a275f4459f7c1d66eba7.

See #29 for why.