Right, will do it after merge in a separate commit.