Remove init hack in DiscoveryService