Reverted the ServiceDefinitionProviderInterface idea