Reverted CB's ArrayList -> CopyOnWriteArrayList patch. Fixes #1325