Reverting changes for CollectionMapper