diff --git a/bin/babel/file.js b/bin/babel/file.js
index a45fb5ba6a..81ccf2a27e 100644
--- a/bin/babel/file.js
+++ b/bin/babel/file.js
@@ -1,10 +1,10 @@
-var sourceMap = require("source-map");
-var chokidar  = require("chokidar");
-var util2     = require("../../lib/babel/util");
-var path      = require("path");
-var util      = require("./util");
-var fs        = require("fs");
-var _         = require("lodash");
+var sourceMapToComment = require("source-map-to-comment");
+var sourceMap          = require("source-map");
+var chokidar           = require("chokidar");
+var path               = require("path");
+var util               = require("./util");
+var fs                 = require("fs");
+var _                  = require("lodash");
 
 module.exports = function (commander, filenames) {
   var results = [];
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + util2.sourceMapToComment(map);
+      code += "\n" + sourceMapToComment(map);
     }
 
     return {
diff --git a/lib/babel/transformation/file.js b/lib/babel/transformation/file.js
index e87042c47c..c98dd022e3 100644
--- a/lib/babel/transformation/file.js
+++ b/lib/babel/transformation/file.js
@@ -4,18 +4,19 @@ module.exports = File;
 
 var SHEBANG_REGEX = /^\#\!.*/;
 
-var isFunction = require("lodash/lang/isFunction");
-var transform  = require("./index");
-var generate   = require("../generation");
-var defaults   = require("lodash/object/defaults");
-var includes   = require("lodash/collection/includes");
-var clone      = require("../helpers/clone");
-var parse      = require("../helpers/parse");
-var Scope      = require("../traversal/scope");
-var util       = require("../util");
-var path       = require("path");
-var each       = require("lodash/collection/each");
-var t          = require("../types");
+var sourceMapToComment = require("source-map-to-comment");
+var isFunction         = require("lodash/lang/isFunction");
+var transform          = require("./index");
+var generate           = require("../generation");
+var defaults           = require("lodash/object/defaults");
+var includes           = require("lodash/collection/includes");
+var clone              = require("../helpers/clone");
+var parse              = require("../helpers/parse");
+var Scope              = require("../traversal/scope");
+var util               = require("../util");
+var path               = require("path");
+var each               = require("lodash/collection/each");
+var t                  = require("../types");
 
 function File(opts) {
   this.dynamicImportedNoDefault = [];
@@ -454,7 +455,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 
diff --git a/lib/babel/util.js b/lib/babel/util.js
index cec53811fc..a5808866de 100644
--- a/lib/babel/util.js
+++ b/lib/babel/util.js
@@ -76,12 +76,6 @@ exports.isAbsolute = function (loc) {
   return false;
 };
 
-exports.sourceMapToComment = function (map) {
-  var json = JSON.stringify(map);
-  var base64 = new Buffer(json).toString("base64");
-  return "//# sourceMappingURL=data:application/json;base64," + base64;
-};
-
 var templateVisitor = {
   enter: function (node, parent, scope, nodes) {
     if (t.isExpressionStatement(node)) {
diff --git a/package.json b/package.json
index 33e1099b20..30b44aee9a 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,8 @@
     "regenerator-babel": "0.8.10-1",
     "regexpu": "^1.1.1",
     "source-map": "^0.1.43",
-    "source-map-support": "^0.2.9"
+    "source-map-support": "^0.2.9",
+    "source-map-to-comment": "^1.0.0"
   },
   "devDependencies": {
     "browserify": "^8.1.3",