F1 confirms popular former race venue to return in major deal