I think Martin says that this particular change should be done with separate commit.