Will Our Next President Stop the War on Drugs?

It's not likely that Obama or McCain will order a full-scale troop withdrawal in the war on drugs any time soon. However, both candidates have reason to know we're losing the war, according to a recent piece by Joe Conason in Salon.
What about you? Do you think we'll see more emphasis on alcohol and drug treatment in the next administration?
UPDATE: Join Together reports that John Carnevale, Ph.D., has released a policy brief calling for the next administration to focus the Office of National Drug Control Policy on "data and research". Though drug interdiction would still be on the menu, federal funding and emphasis would shift to prevention and treatment. Let's hope Carnevale's brief is influential.