I am not against this, but I'd prefer to have it as a separate commit.