[PATCH aeolus 4/6] Task 197 - Remove any logic forcing one provider only