0ff0104a68
Partially revert commit 7248f073f06f6a44ab48088679b45f3242436e28. Deleting items during list iteration can lead to problems. In this case an infinite loop was introduced in PR #975.