Fix upgrade for next experimental release