This should address what @faluchet has observed in the EOS CI pipelines (In fact, it should have been done in the first place but I didn't dare changing the code that far).
merged
mentioned in commit b6437201