Replace the cl hack with fixed -remove-at-indices