Better un-collapsing.