diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/DefaultPassConfig.java
+++ b/src/com/google/javascript/jscomp/DefaultPassConfig.java
@@ -246,6 +246,10 @@ public final class DefaultPassConfig extends PassConfig {
       checks.add(checkProvides);
     }
 
+    if (options.generateExports && !options.skipNonTranspilationPasses) {
+      checks.add(generateExports);
+    }
+
     // Late ES6 transpilation.
     // Includes ES6 features that are best handled natively by the compiler.
     // As we convert more passes to handle these features, we will be moving the transpilation
@@ -282,13 +286,6 @@ public final class DefaultPassConfig extends PassConfig {
       checks.add(angularPass);
     }
 
-    // The following passes are more like "preprocessor" passes.
-    // It's important that they run before most checking passes.
-    // Perhaps this method should be renamed?
-    if (options.generateExports) {
-      checks.add(generateExports);
-    }
-
     if (options.exportTestFunctions) {
       checks.add(exportTestFunctions);
     }
Moving generate exports pass to before the later transpilation step
-------------
Created by MOE: <URL>