diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js
index c69f2990b8..bba4a3cfbe 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js
@@ -13,11 +13,8 @@ define(["exports"], function (exports) {
   exports.default = [];
   exports.default = foo;
   exports.default = class {};
-
   function foo() {}
-
   class Foo {}
-
   exports.default = Foo;
   exports.default = foo;
 
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-variable/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-variable/expected.js
index 7eab6af757..f450b47ca5 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-variable/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-variable/expected.js
@@ -8,17 +8,12 @@ define(["exports"], function (exports) {
   var foo = exports.foo = 1;
   var foo = exports.foo = 1,
       bar = exports.bar = 2;
-
   var foo2 = exports.foo2 = function () {};
-
   var foo3 = exports.foo3 = undefined;
   let foo4 = exports.foo4 = 2;
   let foo5 = exports.foo5 = undefined;
   const foo6 = exports.foo6 = 3;
-
   function foo7() {}
-
   class foo8 {}
-
   exports.foo8 = foo8;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js
index 3e75a0bab4..fe1fcfa593 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js
@@ -6,7 +6,6 @@ define(["exports", "./evens"], function (exports, _evens) {
   });
   exports.isOdd = undefined;
   exports.nextOdd = nextOdd;
-
   function nextOdd(n) {
     return (0, _evens.isEven)(n) ? n + 1 : n + 2;
   }
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-glob/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-glob/expected.js
index 54accef1cd..665aa6cd96 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-glob/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/imports-glob/expected.js
@@ -2,5 +2,7 @@ define(["foo"], function (_foo) {
   "use strict";
 
   var foo = babelHelpers.interopRequireWildcard(_foo);
+
+
   foo;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/overview/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/overview/expected.js
index d0074ed64a..5e7835b5a2 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/overview/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/overview/expected.js
@@ -8,7 +8,10 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports,
   var foo2 = babelHelpers.interopRequireWildcard(_foo);
   exports.test = test;
   var test2 = exports.test2 = 5;
+
   exports.default = test;
+
+
   foo2.default;
   foo2;
   _foo.bar;
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/remap/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/remap/expected.js
index b841cb2e28..8e527e7dc4 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/remap/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/remap/expected.js
@@ -16,12 +16,17 @@ define(["exports"], function (exports) {
 
   var a = 2;
   exports.a = a;
+
   exports.a = a = 3;
+
   var b = 2;
   exports.c = b;
+
   exports.c = b = 3;
+
   var d = 3;
   exports.e = d;
   exports.f = d;
+
   exports.f = exports.e = d = 4;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/remap/expected.js b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/remap/expected.js
index e3dc453b03..44c5027480 100644
--- a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/remap/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/remap/expected.js
@@ -10,7 +10,6 @@ System.register([], function (_export, _context) {
       _export("test", test);
 
       _export("test", test = 5);
-
       _export("test", test++);
 
       (function () {
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js
index b728ff10f8..0f85d5e0f4 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js
@@ -25,11 +25,8 @@
   exports.default = [];
   exports.default = foo;
   exports.default = class {};
-
   function foo() {}
-
   class Foo {}
-
   exports.default = Foo;
   exports.default = foo;
 
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-variable/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-variable/expected.js
index 9058efe940..ac558777c7 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-variable/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-variable/expected.js
@@ -20,17 +20,12 @@
   var foo = exports.foo = 1;
   var foo = exports.foo = 1,
       bar = exports.bar = 2;
-
   var foo2 = exports.foo2 = function () {};
-
   var foo3 = exports.foo3 = undefined;
   let foo4 = exports.foo4 = 2;
   let foo5 = exports.foo5 = undefined;
   const foo6 = exports.foo6 = 3;
-
   function foo7() {}
-
   class foo8 {}
-
   exports.foo8 = foo8;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js
index d6c94e1095..2bfd6402da 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js
@@ -18,7 +18,6 @@
   });
   exports.isOdd = undefined;
   exports.nextOdd = nextOdd;
-
   function nextOdd(n) {
     return (0, _evens.isEven)(n) ? n + 1 : n + 2;
   }
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-glob/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-glob/expected.js
index e1b8c91010..25cbef806d 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-glob/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/imports-glob/expected.js
@@ -14,5 +14,7 @@
   "use strict";
 
   var foo = babelHelpers.interopRequireWildcard(_foo);
+
+
   foo;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/overview/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/overview/expected.js
index 65035cf887..a388b89c18 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/overview/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/overview/expected.js
@@ -20,7 +20,10 @@
   var foo2 = babelHelpers.interopRequireWildcard(_foo);
   exports.test = test;
   var test2 = exports.test2 = 5;
+
   exports.default = test;
+
+
   _foo.bar;
   _foo.foo;
 });
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/remap/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/remap/expected.js
index a2267cfbf6..dc346b39d3 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/remap/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/remap/expected.js
@@ -28,12 +28,17 @@
 
   var a = 2;
   exports.a = a;
+
   exports.a = a = 3;
+
   var b = 2;
   exports.c = b;
+
   exports.c = b = 3;
+
   var d = 3;
   exports.e = d;
   exports.f = d;
+
   exports.f = exports.e = d = 4;
 });
diff --git a/packages/babel-template/src/index.js b/packages/babel-template/src/index.js
index eff83a1fc9..2995a10d55 100644
--- a/packages/babel-template/src/index.js
+++ b/packages/babel-template/src/index.js
@@ -99,6 +99,7 @@ let templateVisitor = {
   },
 
   exit({ node }) {
-    traverse.clearNode(node);
+    if (!node.loc)
+      traverse.clearNode(node);
   }
 };