Original: F1 did n't return to Fuji until 2007.
Simplified: F1 did n't return to Fuji until.