Removed unnecessary code from resolver.
Merge pull request #351 from oliverschmidt/master

Removed unnecessary code from resolver.
Merge remote-tracking branch 'upstream/master'