Update to latest resolver, remove Resolver monkey patches.