remove functionality added to the queue iterator. fixes #2483
Merge pull request #2926 from eminn/fix/queue/iterator-maintenance

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