Revert https://review.opencontrail.org/#/c/4683/ as it breaks discovery

Change-Id: I90601523fd2aa5d5ee5cc8ba2e7624618b64131b