Revert "Merge pull request #171 from scottwallacesh/master"

This reverts commit 41fad297d98ed03534a230ef9b0f2dc9948c5b1f, reversing
changes made to 3d488fec9c70a45f76737caea69a761182304159.