From a450e13a9516febcc110560a14535e649e1c5ef9 Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Fri, 2 Aug 2019 15:04:31 -0700
Subject: [PATCH] Revert "Fixed JS parsing of default map values (#6394)"
 (#6468)

This reverts commit dcc8ffd9c6fab3c82d3d6642a35a584aa0a3f64b.
---
 js/map.js                                       | 8 ++------
 src/google/protobuf/compiler/js/js_generator.cc | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/js/map.js b/js/map.js
index 734b1566f7..b9a48afed7 100644
--- a/js/map.js
+++ b/js/map.js
@@ -465,15 +465,11 @@ jspb.Map.prototype.serializeBinary = function(
  *    entries with unset keys is required for maps to be backwards compatible
  *    with the repeated message representation described here: goo.gl/zuoLAC
  *
- * @param {V=} opt_defaultValue
- *    The default value for the type of map values.
- *
  */
 jspb.Map.deserializeBinary = function(map, reader, keyReaderFn, valueReaderFn,
-                                      opt_valueReaderCallback, opt_defaultKey,
-                                      opt_defaultValue) {
+                                      opt_valueReaderCallback, opt_defaultKey) {
   var key = opt_defaultKey;
-  var value = opt_defaultValue;
+  var value = undefined;
 
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc
index 2a797e9b57..88c9a0fb37 100644
--- a/src/google/protobuf/compiler/js/js_generator.cc
+++ b/src/google/protobuf/compiler/js/js_generator.cc
@@ -3142,7 +3142,6 @@ void Generator::GenerateClassDeserializeBinaryField(
       printer->Print(", null");
     }
     printer->Print(", $defaultKey$", "defaultKey", JSFieldDefault(key_field));
-    printer->Print(", $defaultValue$", "defaultValue", JSFieldDefault(value_field));
     printer->Print(");\n");
     printer->Print("         });\n");
   } else {