Revert "Merge pull request #190 from kpxp/master"

This reverts commit 78a517d9974641b61af317bcbb9eae57e20aedf6, reversing
changes made to 33c273ccc1c69dd1e516dbf8dd99df0615df16e8.
merge