Avoid the panic on upgrade