Revert back: remove concurrent enumeration