Add back ColumnIdentifier comparison since we do use it