diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 8f01d7bb19f0..f82c2909af3f 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -2075,7 +2075,7 @@ RadioInterface.prototype = {
         gTelephonyService.notifyConferenceCallStateChanged(message.state);
         break;
       case "cdmaCallWaiting":
-        gTelephonyService.notifyCdmaCallWaiting(this.clientId, message.waitingCall);
+        gTelephonyService.notifyCdmaCallWaiting(this.clientId, message.number);
         break;
       case "suppSvcNotification":
         gTelephonyService.notifySupplementaryService(this.clientId,
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 7153e9a20a53..62a027fc3274 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -5529,7 +5529,7 @@ RilObject.prototype[REQUEST_GET_CURRENT_CALLS] = function REQUEST_GET_CURRENT_CA
     if (RILQUIRKS_CALLSTATE_EXTRA_UINT32) {
       Buf.readInt32();
     }
-    call.number             = Buf.readString();
+    call.number             = Buf.readString(); //TODO munge with TOA
     call.numberPresentation = Buf.readInt32(); // CALL_PRESENTATION_*
     call.name               = Buf.readString();
     call.namePresentation   = Buf.readInt32();
@@ -6860,7 +6860,7 @@ RilObject.prototype[UNSOLICITED_CDMA_CALL_WAITING] = function UNSOLICITED_CDMA_C
   call.alertPitch          = Buf.readInt32();
   call.signal              = Buf.readInt32();
   this.sendChromeMessage({rilMessageType: "cdmaCallWaiting",
-                          waitingCall: call});
+                          number: call.number});
 };
 RilObject.prototype[UNSOLICITED_CDMA_OTA_PROVISION_STATUS] = function UNSOLICITED_CDMA_OTA_PROVISION_STATUS() {
   let status = this.context.Buf.readInt32List()[0];
diff --git a/dom/telephony/gonk/TelephonyService.js b/dom/telephony/gonk/TelephonyService.js
index dc97dd77a96f..265effffff33 100644
--- a/dom/telephony/gonk/TelephonyService.js
+++ b/dom/telephony/gonk/TelephonyService.js
@@ -361,9 +361,7 @@ TelephonyService.prototype = {
       for (let i = 0, indexes = Object.keys(calls); i < indexes.length; ++i) {
         let call = calls[indexes[i]];
         aListener.enumerateCallState(call.clientId, call.callIndex,
-                                     call.state, call.number,
-                                     call.numberPresentation, call.name,
-                                     call.namePresentation, call.isOutgoing,
+                                     call.state, call.number, call.isOutgoing,
                                      call.isEmergency, call.isConference,
                                      call.isSwitchable, call.isMergeable);
       }
@@ -731,9 +729,6 @@ TelephonyService.prototype = {
                                                     aCall.callIndex,
                                                     aCall.state,
                                                     aCall.number,
-                                                    aCall.numberPresentation,
-                                                    aCall.name,
-                                                    aCall.namePresentation,
                                                     aCall.isOutgoing,
                                                     aCall.isEmergency,
                                                     aCall.isConference,
@@ -798,13 +793,6 @@ TelephonyService.prototype = {
       call.isMergeable = aCall.isMergeable != null ?
                          aCall.isMergeable : true;
 
-      call.numberPresentation = aCall.numberPresentation != null ?
-                                aCall.numberPresentation : nsITelephonyProvider.CALL_PRESENTATION_ALLOWED;
-      call.name = aCall.name != null ?
-                  aCall.name : "";
-      call.namePresentation = aCall.namePresentation != null ?
-                              aCall.namePresentation : nsITelephonyProvider.CALL_PRESENTATION_ALLOWED;
-
       this._currentCalls[aClientId][aCall.callIndex] = call;
     }
 
@@ -812,9 +800,6 @@ TelephonyService.prototype = {
                                                   call.callIndex,
                                                   call.state,
                                                   call.number,
-                                                  call.numberPresentation,
-                                                  call.name,
-                                                  call.namePresentation,
                                                   call.isOutgoing,
                                                   call.isEmergency,
                                                   call.isConference,
@@ -822,7 +807,7 @@ TelephonyService.prototype = {
                                                   call.isMergeable]);
   },
 
-  notifyCdmaCallWaiting: function(aClientId, aCall) {
+  notifyCdmaCallWaiting: function(aClientId, aNumber) {
     // We need to acquire a CPU wake lock to avoid the system falling into
     // the sleep mode when the RIL handles the incoming call.
     this._acquireCallRingWakeLock();
@@ -833,11 +818,7 @@ TelephonyService.prototype = {
       // call comes after a 3way call.
       this.notifyCallDisconnected(aClientId, call);
     }
-    this._notifyAllListeners("notifyCdmaCallWaiting", [aClientId,
-                                                       aCall.number,
-                                                       aCall.numberPresentation,
-                                                       aCall.name,
-                                                       aCall.namePresentation]);
+    this._notifyAllListeners("notifyCdmaCallWaiting", [aClientId, aNumber]);
   },
 
   notifySupplementaryService: function(aClientId, aCallIndex, aNotification) {