I agree. Ideally we should also contribute such changes to the xe-guest-agent upstream repository.