For cases where we do not need FFS, we do not need the index.

This does not change anything yet.

This patch only works together with the next (so git bisect is expected
to break here). The split is to separate manual changes from automated
patching.