Time to dust off the Cutty Sark?

As long as they keep diesel engines for when the wind is going the wrong way, sure.

Reminds me... what did they use before sailboats?

Diesel freighters.

https://www.designboom.com/technology/oceanbird-wallneius-marine-09-14-2020/