Merge "Revert "Tell the resolver what protocols to use.""