diff --git a/spec/compile-cache-spec.coffee b/spec/compile-cache-spec.coffee
index c17ba01e1..bec689c7d 100644
--- a/spec/compile-cache-spec.coffee
+++ b/spec/compile-cache-spec.coffee
@@ -17,7 +17,7 @@ describe 'CompileCache', ->
     CompileCache.resetCacheStats()
 
     spyOn(Babel, 'transform').andReturn {code: 'the-babel-code'}
-    spyOn(CoffeeScript, 'compile').andReturn {js: 'the-coffee-code', v3SourceMap: "{}"}
+    spyOn(CoffeeScript, 'compile').andReturn 'the-coffee-code'
     spyOn(TypeScriptSimple::, 'compile').andReturn 'the-typescript-code'
 
   afterEach ->
diff --git a/src/coffee-script.js b/src/coffee-script.js
index 967d07cdd..0437e787f 100644
--- a/src/coffee-script.js
+++ b/src/coffee-script.js
@@ -36,13 +36,10 @@ exports.compile = function (sourceCode, filePath) {
   var output = CoffeeScript.compile(sourceCode, {
     filename: filePath,
     sourceFiles: [filePath],
-    sourceMap: true
+    inlineMap: true
   })
 
-  var js = output.js
-  js += '\n'
-  js += '//# sourceMappingURL=data:application/json;base64,'
-  js += new Buffer(output.v3SourceMap).toString('base64')
-  js += '\n'
-  return js
+  // Strip sourceURL from output so there wouldn't be duplicate entries
+  // in devtools.
+  return output.replace(/\/\/# sourceURL=[^'"\n]+\s*$/, '')
 }
diff --git a/src/compile-cache.js b/src/compile-cache.js
index 03d2376bc..ad1bd0a85 100644
--- a/src/compile-cache.js
+++ b/src/compile-cache.js
@@ -74,7 +74,7 @@ function compileFileAtPath (compiler, filePath, extension) {
       cacheStats[extension].hits++
     } else {
       cacheStats[extension].misses++
-      compiledCode = addSourceURL(compiler.compile(sourceCode, filePath), filePath)
+      compiledCode = compiler.compile(sourceCode, filePath)
       writeCachedJavascript(cachePath, compiledCode)
     }
     return compiledCode
@@ -97,13 +97,6 @@ function writeCachedJavascript (relativeCachePath, code) {
   fs.writeFileSync(cachePath, code, 'utf8')
 }
 
-function addSourceURL (jsCode, filePath) {
-  if (process.platform === 'win32') {
-    filePath = '/' + path.resolve(filePath).replace(/\\/g, '/')
-  }
-  return jsCode + '\n' + '//# sourceURL=' + encodeURI(filePath) + '\n'
-}
-
 var INLINE_SOURCE_MAP_REGEXP = /\/\/[#@]\s*sourceMappingURL=([^'"\n]+)\s*$/mg
 
 require('source-map-support').install({