Revert "[discovery/etcd]"

This reverts commit 223c3c72b1161c70859560a83e684476f3f52c4e.