Imola's F1 return will be as two-day grand prix