Revert "Merge pull request #165 from mdchaney/master"

This reverts commit 9658b7d79ace31a434f7043657eb1078934d3bb7, reversing
changes made to e29d983d9dec87e9a228451ea51e8b66d7744f38.