The International Sailing Federation has done a u-turn and reinstated windsurfing to the Rio de Janeiro Olympics.
ISAF stunned the sport when it controversially replaced the traditional boardsailing for the more modern kiteboarding.
A number of members, led by Oceania, voiced their opposition to the change and have won a vote at the general assembly in Dublin this morning.
Windsurfing has been at the Olympics since 1984, with New Zealand winning seven medals in the class.
