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

This reverts commit 8dd97dfb7141624222765fc13d19f99327fe1fce, reversing
changes made to 03f774ba5daa2eb4c990e78ac3056037221a9c7b.