Let's not re-use the same iterator esp when it's still iterating.

Change-Id: I1752857bc036f8d389b4b71d570cf83a76ef29ea