Revert removal of CollectionUtils