Annan: UN will return to Iraq when security improves