Merge "Revert "Fix service discovery add""