@peterflynn Do you think we should get rid of the `replaceProvider` argument for now?