Revert "Merge pull request #26 from borismod/master"

This reverts commit b6362e9cc07b902a4775614a1ea2dcfd02d09a90, reversing
changes made to c647610cd0a126d6a534f9818a3e1bebd19c37c3.