am 138e0db4: Fix off-by-one issue when removing from Iterator

* commit '138e0db47a8fe52d96d38c7be3fe9d2ad7f4083b':
  Fix off-by-one issue when removing from Iterator