Yes, it's the one with the fake Mandarin. Killian's weak "No, I'm the real Mandarin!" was, I suspect, a last-minute change they threw in to try and placate fans who would have received the actor revelation poorly. Nobody bought it, of course. It's obvious that they simply decided to sacrifice the Mandarin as a villain just so they could pull their "clever" little twist.