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

This reverts commit 67363c1cf6ae6268373fd663c0fce65683c27f01, reversing
changes made to 8d4f6fe496a737e3340516244a1669d405a2e5c1.