Partial revert #8638

Job	Run time
classicmode_1d_3dgrid	7m 55s
classicmode_3d	7m 14s
kilonova_1d_1dgrid	4m 18s
kilonova_1d_3dgrid	4m 39s
kilonova_2d_2dgrid	6m 15s
kilonova_2d_2dgrid_barnesthermalisation	5m 1s
kilonova_2d_2dgrid_expansionopac	4m 34s
kilonova_2d_2dgrid_xcomgammaphotoion	4m 44s
kilonova_2d_3dgrid	6m 22s
nebular_1d_3dgrid	11m 34s
nebular_1d_3dgrid_limitbfest	13m 40s
combine_checksums	18s
	1h 16m 34s

Provide feedback