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

This reverts commit 0747a208a0297269ac06dee2168e8215683121de, reversing
changes made to 23b2025005406c680057d1e25ded82c9eb8ffdcb.