Revert "fix line iterator position, #2051" [#2090]

This reverts commit 61242a78de3a760674fd6f30031c8830a83684e2.

Reopens #2051.