Question about working with upstream vs patches