Remove upstreamed patch and update sources