Remove an instance monkeypatch that can just be in a module
Remove obsolete Builder option
Merge pull request #142 from shepmaster/fewer-monkey-patch

Reduce some monkey patching