Fix infinite recursion. Revert to wrap evry resolver.