diff --git a/make/modules/jdk.naming.dns/Java.gmk b/make/modules/jdk.naming.dns/Java.gmk
deleted file mode 100644
index 39134e4cd93..00000000000
--- a/make/modules/jdk.naming.dns/Java.gmk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLED_WARNINGS_java += lossy-conversions
diff --git a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java
index 91dadc42940..65263122342 100644
--- a/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java
+++ b/src/jdk.naming.dns/share/classes/com/sun/jndi/dns/DnsClient.java
@@ -730,7 +730,7 @@ class Tcp {
             return reader.read();
         }
         finally {
-            timeoutLeft -= System.currentTimeMillis() - start;
+            timeoutLeft -= (int) (System.currentTimeMillis() - start);
         }
     }