Partially roll back refactoring

4c92172ccaConrad Irwin committed on 9/8/2023, 10:49:50 PMparentba1c350
3 files changedLine totals unavailable