Revert "Merge pull request #1 from galaxode/master"

This reverts commit cb10a72d42357e6b2f57edd9f039f03d2c54176e, reversing
changes made to 13485df1a3bf433b1c7490409ff9875b0d06dc25.