Revert "Merge pull request #1 from ttscoff/master"

This reverts commit 526f4099ab64603c70db2694ba912812b736e52e, reversing
changes made to 7cc22b4bd1cf84b30ed54203c4881e167399794e.