Havana upgrade should use Havana.