This is consistent with +dnssec and +nsid which only re-enable EDNS if do is set to 1 or nsid is requested.