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

This reverts commit 2a59a42c4f2f60635e7a27f3633898b08367182f, reversing
changes made to f1ec10682521c4f64c5746c6b2d3a34bd309b9a3.