Revert "Merge pull request #101 from hittheroadjack/master"

This reverts commit 7895ab41199b948f83560c353e9b7d7ed3f53569, reversing
changes made to 280976f1492ba3220433fca7c39c8295edc77bb2.