Ditch all of the messing with the collapsed class we do.

From #2602.

Sort of reverts an earlier issue, #2110.