The "Iranian problem" had already been confronted before Trump's first term.