F1 did n't return to Fuji until .
F1 did n't return to Fuji until 2007 .