How exactly are you resetting to Classic? Any details you can give would be helpful. Do you have multiple windows open? I haven't been successful in finding a scenario where this fails. Hard to fix if I can't reproduce the problem.
We all wore onions on our belts as it was the fashion at the time.