well, I was trying to ease into it by hiding this logic behind the universal_provider setting but f it. I'll change all redirects to use the new settings.