Revert collapsing - fails with top-level arrays, etc.