Fixup for new-index changes that ended up in top-of-trunk