Revert "Hopefully fix a ConcurrentModificationException²."

This reverts commit b22ab28d22846f053c72c0cd6f3f740c563c887c.
Hopefully fix a ConcurrentModificationException³.