diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
index a08773f6f..326872a93 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
@@ -179,10 +179,7 @@ public final class OkHostnameVerifier implements HostnameVerifier {
     int suffixLength = cn.length() - (asterisk + 1);
     int suffixStart = hostName.length() - suffixLength;
     if (hostName.indexOf('.', asterisk) < suffixStart) {
-      // TODO: remove workaround for *.clients.google.com http://b/5426333
-      if (!hostName.endsWith(".clients.google.com")) {
-        return false; // wildcard '*' can't match a '.'
-      }
+      return false; // wildcard '*' can't match a '.'
     }
 
     if (!hostName.regionMatches(suffixStart, cn, asterisk + 1, suffixLength)) {