Support for multiple tarballs with different COM energy

This should not have crashed:

Job #16844556 failed for 9efbabb6:

It used to be working, so not sure what's changed?