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

This reverts commit 0d7da9aa3289e3a03ac82c8f4e6b6e73d6fd62ae, reversing
changes made to 28f2dad6b693a7a5b598710d4e8ff169a401a213.