Revert "Merge pull request #142 from GMous/master"

This reverts commit 12342ba35dace060ce323c8172ce3c49f219b673, reversing
changes made to 721266145a1e00befda7c3d9a27f298b542c79e8.