This is an unrelated change?  It would probably be better to remove it in a separate commit.