re #591 - reverting to drupal core collapsible fieldsets