Fixed #22204: Bad circular-dep-breaking if more than one per run