Revert "Merge pull request #3 from clarkr/feature-branch"

This reverts commit 8f54d5323d435cf82250312c65814d691a9e1591, reversing
changes made to d42101dbd1a280ed3d53cefcb64f81687addfa28.