diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index cf1e4e117355..b70ec90eb5e9 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -138,15 +138,7 @@ static const char* logTag = "PeerConnectionImpl";
 
 // Getting exceptions back down from PCObserver is generally not harmful.
 namespace {
-// This is a terrible hack.  The problem is that SuppressException is not
-// inline, and we link this file without libxul in some cases (e.g. for our test
-// setup).  So we can't use ErrorResult or IgnoredErrorResult because those call
-// SuppressException...  And we can't use FastErrorResult because we can't
-// include BindingUtils.h, because our linking is completely fucked up.  Use
-// BaseErrorResult directly.  Please do not let me see _anyone_ doing this
-// without really careful review from someone who knows what they are doing.
-class JSErrorResult :
-    public binding_danger::TErrorResult<binding_danger::JustAssertCleanupPolicy>
+class JSErrorResult : public ErrorResult
 {
 public:
   ~JSErrorResult()
@@ -177,7 +169,6 @@ public:
     }
   }
   operator JSErrorResult &() { return mRv; }
-  operator ErrorResult &() { return mRv; }
 private:
   JSErrorResult mRv;
   bool isCopy;