Fixed upgrade from rc2 and earlier.