Merge "One fewer DependencyProvider"