Skip choose_provider if valid_infrastructure?