Fix temporary hack for run without 322968