Go ahead and make the change in this PR but put it in a separate commit.