Revert "Merge pull request #1 from bhoflack/changes"

This reverts commit 10932d484d5973f36f81765217f9e050697bb60c, reversing
changes made to 26224eb0bc17c54ad49ba8dc1a7190a3c45ae720.