Revert "Merge pull request #170 from mwhite/master"

This reverts commit 67f7ff57d049c5914de318d01fbb627d4b3378d5, reversing
changes made to 824b815b0844827bb72788e41ea0a7d037c37fea.