Revert "Merge pull request #3 from bschwab/master"

This reverts commit 828195c46ce33b3fce32020b7521789e117533e3, reversing
changes made to 24a316f6b002504c5228e7efeba77cacab1a7abc.