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

This reverts commit 16c975641442aee4179f00ed75088939b64d4af7, reversing
changes made to 1c461199b4f8ac9d21e4af8df61465ef4935ac0c.