Revert "Merge pull request #212 from sduskis/master"

This reverts commit cc5ce8b0897620acfcb6b9405c1e7b77a81731f5, reversing
changes made to d4a48bc0cd2edfeb5d811525eb2c516c661401b9.