Revert "Merge pull request #63 from kaitlin/master"

This reverts commit 6f10d7c25799c5b4be78b766c56be85e96e18a12, reversing
changes made to 435a6096d25f53890224aaf0c0fb5118c54258f9.