Despite Distractions, Golf Returns To Olympics