9332177 Simplify ControllerProvider.