First pass at upgrade routine for #2256