These changes should be revisited when we dropped support for nessai <0.7.0
10/10/22 - Merged in !1158 (closed), so this MR should fix the CI.