Don't pass the resolver where it's not needed
Merge pull request #1744 from marcioj/cleanup

Don't pass the resolver where it's not needed