Tweak upgrade routine for 2.0. #2218