Carmakers rev up for return to Iran market