NXP-11551: don't use RepositoryService