Revert "Merge pull request #1 from richhiggins/master"

Reverts richhiggins/weaver#1