Remove some complexity by making upgrade from 1.3.5+ only.