BUG-5280: do not use CompositeModification in Shard