Revert "Merge pull request #42 from cam-stitt/master"

This reverts commit 6dca8253824d201b9c6ea6916645aeeea612043d, reversing
changes made to ab936f9f8dac2e5420ddd04b3724a4fbba5d002f.