Skate, BMX to make comeback at Vans U.S. Open of Surfing