SERVER-105546 moved in the index spec to a subobject in preparation for adding the ident, but then then we ended up adding the ident to o2 instead and we should revert that change. This isn't just a clean revert as the code has changed significantly since then.

We've never shipped a version with the new format enabled so this is fully upgrade/downgrade safe.