Revert "Merge pull request #113 from thecount92/master"

This reverts commit 497925af5ef9e30da03726b6446f866945a842b0, reversing
changes made to 797d1902b1fa78065dd1a091587f1d7c506f0edd.