Revert "Merge pull request #46 from nctiggy/master"

This reverts commit 5e8545985938b9604cb6c3a1d7576f5118e4ced7, reversing
changes made to de9cadb0b212a111c41e6f9641365fb793954ab5.