Revert "Merge pull request #70 from forobliot/master"

This reverts commit 14eea29a31c25cc20fc2407950a0908c5ac88fd2, reversing
changes made to 2f5d73ac56b595a6b4076998b8773ae0179ee390.