Re-apply a minimal set of changes after re-forking the upstream repo