Use extracted resolver.
Merge pull request #268 from rjackson/extract_resolver

Use extracted resolver.