Revert "ApiDiscovery: Discovery apis provided by PluggableServices as well"

This reverts commit 1b9e5c3006b5b9ee6b301d65fc8d81675914c826.

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>