Fix service provider for legacy packages