Revert "Use Consul ServiceAddress instead of Address when set"
Revert "Use Consul ServiceAddress instead of Address when set"

This reverts commit 0ac7e7217e28dd165787b80219f6085c8d97f814.

See discussion on https://github.com/prometheus/prometheus/pull/812 for
reasoning. While fixing one use case, it breaks others, and we need a
more generic way of handling this.

kzittritsch/prometheus,GoogleCloudPlatform/prometheus,mtanda/prometheus,wxdublin/prometheus,adamron1/prometheus,wxdublin/prometheus,trigrass2/prometheus,dmilstein/prometheus,eliothedeman/prometheus,gcnonato/prometheus,SaltedMan/prometheus-annotated,dmilstein/prometheus,gottwald/prometheus,robbiet480/prometheus,Gouthamve/prometheus,brancz/prometheus,robbiet480/prometheus,fabric8io/prometheus,JavierZunzunegui/prometheus,dalanlan/prometheus,nicr9/prometheus,SaltedMan/prometheus-annotated,ton31337/prometheus,abhishekamralkar/prometheus,wrouesnel/prometheus,RobertKielty/prometheus,Dieterbe/prometheus,Dieterbe/prometheus,abhishekamralkar/prometheus,kangwoo/prometheus,tomwilkie/prometheus,hustbill/prometheus,Stackdriver/stackdriver-prometheus,hustbill/prometheus,alileza/prometheus,mtanda/prometheus,kzittritsch/prometheus,Conorbro/prometheus,tattsun/prometheus,laushinka/prometheus,laushinka/prometheus,fabric8io/prometheus,PrFalken/prometheus,ton31337/prometheus,agaoglu/prometheus,nicr9/prometheus,agaoglu/prometheus,laushinka/prometheus,jbdalido/prometheus,brancz/prometheus,adamron1/prometheus,AlekSi/prometheus,Stackdriver/stackdriver-prometheus,trigrass2/prometheus,cit-lab/prometheus,prasincs/prometheus,Gouthamve/prometheus,alileza/prometheus,tattsun/prometheus,jimmidyson/prometheus,yanghongkjxy/prometheus,iksaif/prometheus,SaltedMan/prometheus-annotated,tomwilkie/prometheus,slok/prometheus,keegancsmith/prometheus,cit-lab/prometheus,fabric8io/prometheus,PrFalken/prometheus,prasincs/prometheus,brancz/prometheus,PrFalken/prometheus,slok/prometheus,thachmai/prometheus,abhishekamralkar/prometheus,amorken/prometheus,prometheus/prometheus,sudhi-vm/prometheus,mrwacky42/prometheus,jimmidyson/prometheus,iksaif/prometheus,AlekSi/prometheus,msiebuhr/prometheus,tomwilkie/prometheus,dalanlan/prometheus,kzittritsch/prometheus,iksaif/prometheus,agaoglu/prometheus,dmilstein/prometheus,thachmai/prometheus,dln/prometheus,nicr9/prometheus,JavierZunzunegui/prometheus,Colstuwjx/prometheus,kangwoo/prometheus,yanghongkjxy/prometheus,gcnonato/prometheus,dmilstein/prometheus,RobertKielty/prometheus,eliothedeman/prometheus,jbdalido/prometheus,datajet-io/prometheus,kzittritsch/prometheus,Conorbro/prometheus,amorken/prometheus,datajet-io/prometheus,robbiet480/prometheus,sudhi-vm/prometheus,amorken/prometheus,datajet-io/prometheus,ton31337/prometheus,laushinka/prometheus,Conorbro/prometheus,gottwald/prometheus,sudhi-vm/prometheus,AlekSi/prometheus,wndhydrnt/prometheus,keegancsmith/prometheus,mtanda/prometheus,dln/prometheus,jbdalido/prometheus,dsymonds/prometheus,eliothedeman/prometheus,GoogleCloudPlatform/prometheus,tattsun/prometheus,tomwilkie/prometheus,agaoglu/prometheus,Dieterbe/prometheus,thachmai/prometheus,wrouesnel/prometheus,prometheus/prometheus,ton31337/prometheus,gottwald/prometheus,JavierZunzunegui/prometheus,mtanda/prometheus,gottwald/prometheus,Gouthamve/prometheus,adamron1/prometheus,dpatel06/prometheus,gcnonato/prometheus,dsymonds/prometheus,wxdublin/prometheus,SaltedMan/prometheus-annotated,prometheus/prometheus,trigrass2/prometheus,keegancsmith/prometheus,Colstuwjx/prometheus,yanghongkjxy/prometheus,Conorbro/prometheus,slok/prometheus,thachmai/prometheus,abhishekamralkar/prometheus,flier/prometheus,robbiet480/prometheus,jimmidyson/prometheus,msiebuhr/prometheus,cit-lab/prometheus,wrouesnel/prometheus,dsymonds/prometheus,wrouesnel/prometheus,slok/prometheus,mrwacky42/prometheus,cit-lab/prometheus,wndhydrnt/prometheus,flier/prometheus,alileza/prometheus,RobertKielty/prometheus,brancz/prometheus,kangwoo/prometheus,gcnonato/prometheus,dpatel06/prometheus,fabric8io/prometheus,sudhi-vm/prometheus,eliothedeman/prometheus,alileza/prometheus,adamron1/prometheus,RobertKielty/prometheus,GoogleCloudPlatform/prometheus,msiebuhr/prometheus,dpatel06/prometheus,dsymonds/prometheus,datajet-io/prometheus,Stackdriver/stackdriver-prometheus,keegancsmith/prometheus,hustbill/prometheus,dln/prometheus,Colstuwjx/prometheus,AlekSi/prometheus,GoogleCloudPlatform/prometheus,trigrass2/prometheus,jbdalido/prometheus,msiebuhr/prometheus,dalanlan/prometheus,Colstuwjx/prometheus,PrFalken/prometheus,JavierZunzunegui/prometheus,keegancsmith/prometheus,mrwacky42/prometheus,yanghongkjxy/prometheus,prometheus/prometheus,flier/prometheus,prometheus/prometheus,wndhydrnt/prometheus,kangwoo/prometheus,Stackdriver/stackdriver-prometheus,amorken/prometheus,tattsun/prometheus,iksaif/prometheus,GoogleCloudPlatform/prometheus,prasincs/prometheus,hustbill/prometheus,prasincs/prometheus,alileza/prometheus,dln/prometheus,Gouthamve/prometheus