Revert "Merge pull request #1 from clarkr/my-cool-feature-rebase"

This reverts commit 92ad767c8efce3a588a961d4827236f8532ec788, reversing
changes made to d480c8f982c08064d02e6bd02100d207a110fe6c.