This is awkward, since this change is from an earlier commit. Does `git rebase master` not get rid of this?