diff --git a/src/opendap/ngap/NgapBesApi.java b/src/opendap/ngap/NgapBesApi.java
index fe9eb3f27..6c2d56fdc 100644
--- a/src/opendap/ngap/NgapBesApi.java
+++ b/src/opendap/ngap/NgapBesApi.java
@@ -273,9 +273,16 @@ public  Document getDap4RequestDocument(User user,
 
         addEdlAuthToken(request,user);
 
-        if(qp.computeChecksums())
-            request.addContent(setContextElement(DAP4_CHECKSUMS_CONTEXT,"true"));
-
+        // @FIXME - THIS IS WHERE WE WOULD INVOKE OPTIONAL CHECKSUMS, BUT WE ARE MAKING THEM MANDATORY TO
+        //   ACCOMMODATE BROKEN CLIENT CODE THAT EXPECTS THEM TO AWLAYS BE THERE. THIS WILL BREAK getdap4
+        //   AND ALL OF THE ASSOCIATED TESTS BECAUSE AT THE TIME THIS IS WRITTEN THERE IS NO WAY FOR A
+        //   FOR A CLIENT TO KNOW THAT A DAP4 DATA RESPONSE CONTAINS CHECKSUMS.
+        //
+        // if(qp.computeChecksums())
+        if(type.equalsIgnoreCase(DAP4_DATA) ||
+                (type.equalsIgnoreCase(DAP4_DMR) && qp.computeChecksums()) ) {
+            request.addContent(setContextElement(DAP4_CHECKSUMS_CONTEXT, "true"));
+        }
         request.addContent(setContainerElement(getBesContainerName(),
                 getBesSpaceName(),remoteDataSourceUrl,type));