diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js
index 71ffe6e9c3..3d6fbae1e2 100644
--- a/packages/babel-generator/src/generators/modules.js
+++ b/packages/babel-generator/src/generators/modules.js
@@ -45,12 +45,6 @@ export function ExportAllDeclaration(node: Object) {
   this.word("export");
   this.space();
   this.token("*");
-  if (node.exported) {
-    this.space();
-    this.word("as");
-    this.space();
-    this.print(node.exported, node);
-  }
   this.space();
   this.word("from");
   this.space();
diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/actual.js b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js
new file mode 100644
index 0000000000..d6ec00f889
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/DoExpression/actual.js
@@ -0,0 +1,7 @@
+let a = do {
+  if (x > 10) {
+    'big';
+  } else {
+    'small';
+  }
+};
diff --git a/packages/babel-generator/test/fixtures/types/DoExpression/expected.js b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js
new file mode 100644
index 0000000000..d6ec00f889
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/DoExpression/expected.js
@@ -0,0 +1,7 @@
+let a = do {
+  if (x > 10) {
+    'big';
+  } else {
+    'small';
+  }
+};
diff --git a/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js b/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js
new file mode 100644
index 0000000000..5df2b0728d
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/LogicalExpression/actual.js
@@ -0,0 +1,2 @@
+foo ||bar;
+(x => x)|| bar;
diff --git a/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js b/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js
new file mode 100644
index 0000000000..91f0b20ce2
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/LogicalExpression/expected.js
@@ -0,0 +1,2 @@
+foo || bar;
+(x => x) || bar;