Remove support for IServiceProvider Falback