Revived French Grand Prix to follow weekend after Le Mans