Major fix to prevent things from breaking when the CA changes things next week.