Allow for multiple payment providers (bug 969041)