We should perhaps prefix the stage directories differently for each retry. It needs some investigation on how this could be done nicely.