Maybe add a `TODO` here to remove the checks for old style index? Once we re-index we'll no longer need those.