Revert "New index (forwarding)"

This reverts commit 143948e2805077657c277a126dd7f5336e20c253.