Rolled back refactoring of SearchContextProviders to prevent direct exposure of collection (interfaces).