no, use upstream + your patch