As there's no possibility anyone still travelling on this great AONEX fare, my suggestion is for anyone affected of these new rules to either report passport with KRT stamp "lost" or get a secondary passport, as I did when planning on an AONE4 ex-KRT with an Israeli passport stamp. I still regret not finalizing the AONE4 plan to that price
Beeing in Teheran for some days, 10 years ago, I did have some questions of what matter took me there, at Immigration, when entering USA. After passport renewal, nobody asked anything. Living in a country with VWP you nowadays just do the APC, the only person speaking (most often not) to you is at Customs