Revert "Merge pull request #160 from gjuggler/master"

This reverts commit 9bbcf07f09225751fe5f8533d5ddf5645b6db377, reversing
changes made to 3270a0bf462325ca8fa1dd3e1f2700f000d4df7f.