Collapsible: Begin using backcompat code