Bug 1059100 - [email] 2.0-specific XOAuth2 mitigation

Yes, this is the sorta randomly pops up case.