[PLAT-3488] Implement the correct version of Resolver.