Remove intentional-changes for DiscoveryAgentService