Remove upstreamed patch, backport one, and switch one from downstream to upstream patch. Signed-off-by: Rosen Penev <rosenp@gmail.com>