Revert "Merge pull request #110 from thedax/master"

This reverts commit d2bdffcc54baa6ce1c42534cc4be952c2b76422f, reversing
changes made to 8f0d82ffb72efb7fe138e7d1c83635691ba3f4e7.