I take my AC/DC adapter for my laptop with me when flying (doesn't everyone?) so I am prepared for any upgrade/downgrade. Except to Y, of course, so I bring an extra battery too for TATL/TransCon travel. They don't call me "anal rb211" for nothing!
rb211