diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected:
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected:
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected: