diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
index 7148b4e..e845c4f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
@@ -2846,7 +2846,7 @@
     private String exportProvidedNamespace(JDeclaredType x, List<JsStatement> globalStmts,
         String lastProvidedNamespace, Pair<String, String> exportNamespacePair) {
       if (!exportNamespacePair.getLeft().equals(lastProvidedNamespace)) {
-        if (jsInteropMode == OptionJsInteropMode.Mode.JS) {
+        if (!jsExportClosureStyle) {
           JsName provideFunc = indexedFunctions.get("JavaClassHierarchySetupUtil.provide").getName();
           JsNameRef provideFuncRef = provideFunc.makeRef(x.getSourceInfo());
           JsInvocation provideCall = new JsInvocation(x.getSourceInfo());
@@ -2859,7 +2859,7 @@
           JsExprStmt provideStat = createAssignment(globalTemp.makeRef(x.getSourceInfo()),
               provideCall).makeStmt();
           globalStmts.add(provideStat);
-        } else if (jsInteropMode == OptionJsInteropMode.Mode.JS && jsExportClosureStyle) {
+        } else {
           // goog.provide statements prepended by linker, so namespace already exists
           // but enclosing constructor exports may have overwritten them
           // so write foo.bar.Baz = foo.bar.Baz || {}
