Revert "Merge pull request #102 from vuaru/master"

This reverts commit 345b9029c8ceb3e4f441a250e04176a489777bc9, reversing
changes made to 2f12c632df46bd0b5673f9f81d57b3c4f72bf1b1.