Only specify provider if necessary
Merge remote-tracking branch 'mrbanzai/avoid_overriding_provider'