Macron to restore envoy to U.S. after submarine spat