If you rebase off upstream/master, doesn't this change go away?