Remove harmful over optimization (made it impossible to restore
nested folding states)