Reverting to non-hierarchical view