am 7c6be10d: Remove iterators (DO NOT MERGE)

* commit '7c6be10d314413bb7afbed41017343320319915d':
  Remove iterators (DO NOT MERGE)