Revert "Merge pull request #30 from thor1729/master"

This reverts commit f1392355b466121669ed03cb04b18cc4d51b4b0c, reversing
changes made to aa2ec2baa2765e914c8e7284e6f216f9308fc8b7.