s4-s3-upgrade now look for -1 as the special 'not set' value