diff --git a/content/smil/nsSMILTimeValueSpec.cpp b/content/smil/nsSMILTimeValueSpec.cpp
index a21dc42cfdc..ee0c348f309 100644
--- a/content/smil/nsSMILTimeValueSpec.cpp
+++ b/content/smil/nsSMILTimeValueSpec.cpp
@@ -322,32 +322,6 @@ nsSMILTimeValueSpec::GetTimedElement(Element* aElement)
   return &animElement->TimedElement();
 }
 
-// Indicates whether we're allowed to register an event-listener
-// when scripting is disabled.
-bool
-nsSMILTimeValueSpec::IsWhitelistedEvent()
-{
-  // The category of (SMIL-specific) "repeat(n)" events are allowed.
-  if (mParams.mType == nsSMILTimeValueSpecParams::REPEAT) {
-    return true;
-  }
-
-  // A specific list of other SMIL-related events are allowed, too.
-  // NOTE: "repeatEvent", "beginEvent", & "endEvent" aren't in nsGkAtoms --
-  // they're defined in nsDOMEvent.cpp -- so we need to use NS_NewAtom.
-  // (This could probably be optimized, but it's not a huge deal because
-  // we'll rarely hit this code.)
-  if (mParams.mType == nsSMILTimeValueSpecParams::EVENT &&
-      (mParams.mEventSymbol == nsGkAtoms::repeat ||
-       mParams.mEventSymbol == NS_NewAtom("repeatEvent") ||
-       mParams.mEventSymbol == NS_NewAtom("beginEvent") ||
-       mParams.mEventSymbol == NS_NewAtom("endEvent"))) {
-    return true;
-  }
-
-  return false;
-}
-
 void
 nsSMILTimeValueSpec::RegisterEventListener(Element* aTarget)
 {
@@ -360,11 +334,10 @@ nsSMILTimeValueSpec::RegisterEventListener(Element* aTarget)
   if (!aTarget)
     return;
 
-  // When script is disabled, only allow registration for whitelisted events.
-  if (!aTarget->GetOwnerDocument()->IsScriptEnabled() &&
-      !IsWhitelistedEvent()) {
+  // Don't listen for accessKey events if script is disabled. (see bug 704482)
+  if (mParams.mType == nsSMILTimeValueSpecParams::ACCESSKEY &&
+      !aTarget->GetOwnerDocument()->IsScriptEnabled())
     return;
-  }
 
   if (!mEventListener) {
     mEventListener = new EventListener(this);
diff --git a/content/smil/nsSMILTimeValueSpec.h b/content/smil/nsSMILTimeValueSpec.h
index 98bcf43ad6a..913ae75adee 100644
--- a/content/smil/nsSMILTimeValueSpec.h
+++ b/content/smil/nsSMILTimeValueSpec.h
@@ -93,7 +93,6 @@ protected:
   void UpdateReferencedElement(Element* aFrom, Element* aTo);
   void UnregisterFromReferencedElement(Element* aElement);
   nsSMILTimedElement* GetTimedElement(Element* aElement);
-  bool IsWhitelistedEvent();
   void RegisterEventListener(Element* aElement);
   void UnregisterEventListener(Element* aElement);
   nsEventListenerManager* GetEventListenerManager(Element* aElement);