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

Change-Id: I4a213c8220919414a21db0c299cce62a2f5de581