Fix bad upgrade from 1.x versions.