Revert "Merge pull request #62 from dlupu/master"

This reverts commit 419446a77b566140f2eb2257aa9db97d2d15ead6, reversing
changes made to fec979fe5af1a4dd214eb6f2cd24182d21f81013.