Revert "Merge pull request #2 from rrebane/master"

This reverts commit 86c921899afbd1d9034d1abd1ec0bfff04aff634, reversing
changes made to c8ea793e4815a0602a0bc8e416b56aee55f5f90c.