Yes, I think it should be in a separate diff.