!11 (merged) again without out of the box breakage by making a decision to default to the previously always required provider, not accidentally having both options enabled, which isn't allowed. This time with the preprocessor macro change commit too as discussed.