Revert "Merge pull request #173 from regneq/master"

This reverts commit ca378e2fe6d78d3bfcbb1df3f6c6d8056af87897, reversing
changes made to 9739b938b6c173c34c1a46f5b86ae7fddb5e6911.