Who: The IOC
Olympics: Paris 1900

Watching Mike Phelps and company swim back and forth can be plenty entertaining, but it would be infinitely better if they still had obstacles. Back in 1900, the swimmers had to climb over and swim under various obstacles. Why the hell would the IOC not want this? Haven't they seen how much America loves Wipe Out?