Unrelated change?  If it is, it should be split off into a separate commit.