Reverted CB's CopyOnWriteArrayList patch. Fixes # 302