diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp
index 828d6eed..3cab9e94 100644
--- a/libwvdrmengine/cdm/core/src/license.cpp
+++ b/libwvdrmengine/cdm/core/src/license.cpp
@@ -286,12 +286,6 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
       client_id->mutable_client_capabilities();
   bool supports_usage_information;
   if (session_->UsageInformationSupport(&supports_usage_information)) {
-#if 1 // Temporary workaround for b/16994418
-    std::string value;
-    if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
-      supports_usage_information = false;
-    }
-#endif
     client_capabilities->set_session_token(supports_usage_information);
   }
 
@@ -334,18 +328,7 @@ bool CdmLicense::PrepareKeyRequest(const InitializationData& init_data,
 
   uint32_t version = 0;
   if (session_->GetApiVersion(&version)) {
-#if 1 // Temporary workaround for b/16994418
-    std::string value;
-    bool set_api_version = true;
-    if (Properties::GetModelName(&value) && (value == "ADT-1" || value == "fugu")) {
-      set_api_version = false;
-    }
-    if (set_api_version) {
-      client_capabilities->set_oem_crypto_api_version(version);
-    }
-#else
     client_capabilities->set_oem_crypto_api_version(version);
-#endif
   }
 
   if (privacy_mode_enabled) {