daefbd66a6
* Fix regression from #6199: Style of legacy column headers * Fix tests * Clean up variables
* Fix regression from #6199: Style of legacy column headers * Fix tests * Clean up variables