Canadian GP back for 2004