[backport] remove functionality added to the queue iterator. fixes #2483