Drop upstream stuff from this branch.