Donald comes full circle, returning to Riviera one year after forgettable day