CC chairs stop working after unmerging a batch-fixed package