Revert "Merge pull request #55 from etiennetremel/master"

This reverts commit 59db5bfda3e17d80e9ae71f379a090e719ee7d24, reversing
changes made to e6b9b9399d33d27dd1e56feaa06fb2e78131f6b0.