You are right, I will do this in a separate commit.