I'm experiencing the exact same situation. This is the one upgrade issue I haven't figured out.