diff --git a/src/printer.js b/src/printer.js
index 93a30773..4d0b22b1 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -1200,7 +1200,10 @@ function genericPrintNoParens(path, options, print) {
           (n.value.type === "StringLiteral" || n.value.type === "Literal") &&
           typeof n.value.value === "string"
         ) {
-          res = '"' + util.htmlEscapeInsideDoubleQuote(n.value.value) + '"';
+          const value = n.value.extra ? n.value.extra.raw : n.value.raw;
+          res = '"' +
+            value.slice(1, value.length - 1).replace(/"/g, """) +
+            '"';
         } else {
           res = path.call(print, "value");
         }
diff --git a/src/util.js b/src/util.js
index ecf786f1..0b5f6a1b 100644
--- a/src/util.js
+++ b/src/util.js
@@ -265,16 +265,6 @@ function setLocEnd(node, index) {
   }
 }
 
-// http://stackoverflow.com/a/7124052
-function htmlEscapeInsideDoubleQuote(str) {
-  return str.replace(/&/g, "&").replace(/"/g, """);
-  // Intentionally disable the following since it is safe inside of a
-  // double quote context
-  //    .replace(/'/g, ''')
-  //    .replace(/</g, '&lt;')
-  //    .replace(/>/g, '&gt;');
-}
-
 // http://stackoverflow.com/a/7124052
 function htmlEscapeInsideAngleBracket(str) {
   return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -328,6 +318,5 @@ module.exports = {
   locEnd,
   setLocStart,
   setLocEnd,
-  htmlEscapeInsideDoubleQuote,
   htmlEscapeInsideAngleBracket
 };
diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
index 31784417..defb942d 100644
--- a/tests/jsx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
@@ -139,6 +139,17 @@ exports[`expression.js 1`] = `
 "
 `;
 
+exports[`html_escape.js 1`] = `
+"export default () => <a href=\\"https://foo.bar?q1=foo&q2=bar\\" />;
+
+() => <img src=\\"https://bar.foo?param1=1&param2=2\\" />;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+export default () => <a href=\\"https://foo.bar?q1=foo&q2=bar\\" />;
+
+() => <img src=\\"https://bar.foo?param1=1&param2=2\\" />;
+"
+`;
+
 exports[`hug.js 1`] = `
 "<div>
   {__DEV__
@@ -279,7 +290,7 @@ exports[`parens.js 1`] = `
   <path
     key='1'
     d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
-  />,        
+  />,
 ];
 
 <div {...((foo || foo === null) ? {foo} : null)} />
@@ -305,7 +316,7 @@ exports[`quotes.js 1`] = `
 <div id={'\\\\'\\"&quot;<>&amp;quot;'} />;
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 <div id=\\"&quot;'<>&amp;quot;\\" />;
-<div id=\\"&quot;'<>&amp;quot;\\" />;
+<div id=\\"&quot;&#39;<>&amp;quot;\\" />;
 <div id={\\"'\\\\\\"&quot;<>&amp;quot;\\"} />;
 "
 `;
diff --git a/tests/jsx/html_escape.js b/tests/jsx/html_escape.js
new file mode 100644
index 00000000..9582d6ea
--- /dev/null
+++ b/tests/jsx/html_escape.js
@@ -0,0 +1,3 @@
+export default () => <a href="https://foo.bar?q1=foo&q2=bar" />;
+
+() => <img src="https://bar.foo?param1=1&param2=2" />;
diff --git a/tests/jsx/jsfmt.spec.js b/tests/jsx/jsfmt.spec.js
index 7580dfab..c426c19c 100644
--- a/tests/jsx/jsfmt.spec.js
+++ b/tests/jsx/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname, null, ["typescript"]);
+run_spec(__dirname, null, ["babylon", "typescript"]);
diff --git a/tests/jsx/parens.js b/tests/jsx/parens.js
index 36d0e71a..3a31f7c1 100644
--- a/tests/jsx/parens.js
+++ b/tests/jsx/parens.js
@@ -6,7 +6,7 @@ a = [
   <path
     key='1'
     d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
-  />,        
+  />,
 ];
 
 <div {...((foo || foo === null) ? {foo} : null)} />