Backing out second part of the fix for bug 116346 to fix regression bug 392982. a=dsicore@mozilla.com

content/html/content/src/nsFormSubmission.cpp

@@ -765,9 +765,6 @@ nsFSMultipartFormData::AddNameValuePair(nsIDOMHTMLElement* aSource,
   // RFC 2388 specifies that RFC 2047 be used, but I think it's not 
   // consistent with MIME standard.
   mPostDataChunk += NS_LITERAL_CSTRING("--") + mBoundary
-                 + NS_LITERAL_CSTRING(CRLF)
-                 + NS_LITERAL_CSTRING("Content-Type: text/plain; charset=")
-                 + mCharset
                  + NS_LITERAL_CSTRING(CRLF)
                  + NS_LITERAL_CSTRING("Content-Disposition: form-data; name=\"")
                  + nameStr + NS_LITERAL_CSTRING("\"" CRLF CRLF)
@@ -1146,9 +1143,6 @@ GetSubmissionFromForm(nsGenericHTMLElement* aForm,
   nsCOMPtr<nsISaveAsCharset> encoder;
   nsFormSubmission::GetEncoder(aForm, charset, getter_AddRefs(encoder));
 
-  if (!encoder)
-    charset.AssignLiteral("UTF-8");
-
   // Get form processor
   nsCOMPtr<nsIFormProcessor> formProcessor =
     do_GetService(kFormProcessorCID, &rv);