This change breaks stuff... We need to leave the line as it was and instead fix the provider code.