--- a/dom/browser-element/BrowserElementAudioChannel.cpp
+++ b/dom/browser-element/BrowserElementAudioChannel.cpp
@@ -16,17 +16,19 @@
 #include "AudioChannelService.h"
 #include "nsIAppsService.h"
 #include "nsIBrowserElementAPI.h"
 #include "nsIDocShell.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDOMRequest.h"
 #include "nsIObserverService.h"
 #include "nsISupportsPrimitives.h"
+#ifdef MOZ_B2G
 #include "nsISystemMessagesInternal.h"
+#endif
 #include "nsITabParent.h"
 #include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
 #include "nsServiceManagerUtils.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {
 namespace dom {
@@ -518,16 +520,18 @@ BrowserElementAudioChannel::NotifyChanne
                                             getter_AddRefs(request));
     if (NS_WARN_IF(aRv.Failed())) {
       return nullptr;
     }
 
     return request.forget().downcast<DOMRequest>();
   }
 
+// TODO: We need this until bug 1254282 reaches m-c
+#ifdef MOZ_B2G
   nsCOMPtr<nsISystemMessagesInternal> systemMessenger =
     do_GetService("@mozilla.org/system-message-internal;1");
   MOZ_ASSERT(systemMessenger);
 
   JS::Rooted<JS::Value> value(nsContentUtils::RootingCxForThread());
   value.setInt32((uint32_t)mAudioChannel);
 
   nsCOMPtr<nsIURI> manifestURI;
@@ -546,16 +550,19 @@ BrowserElementAudioChannel::NotifyChanne
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return nullptr;
   }
 
   RefPtr<Promise> promiseIns = static_cast<Promise*>(promise.get());
   RefPtr<DOMRequest> request = new DOMRequest(GetOwner());
   RefPtr<RespondSuccessHandler> handler = new RespondSuccessHandler(request);
   promiseIns->AppendNativeHandler(handler);
+#else
+  RefPtr<DOMRequest> request = new DOMRequest(GetOwner());
+#endif
 
   return request.forget();
 }
 
 NS_IMETHODIMP
 BrowserElementAudioChannel::Observe(nsISupports* aSubject, const char* aTopic,
                                     const char16_t* aData)
 {