Revert "Merge pull request #2 from typework/wip"

This reverts commit 26da23bfcb278589e8b93a89e5e07b51241e385a, reversing
changes made to bdca34f16ecc7a4bc5250463efb88e3dc8cca28f.