Revert "Deal with the ConcurrentModification issue. Fixes #873"

This reverts commit ca51b2f.