Revert "Tell the resolver what protocols to use." am: aa035385d3 am: e230672be4

Original change: undetermined

Change-Id: Iaa95ad8317ff45955a1bda3da2046633ba342edf