--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -289,17 +289,17 @@ public class GeckoSession extends LayerS
 
     private final GeckoSessionHandler<PermissionDelegate> mPermissionHandler =
         new GeckoSessionHandler<PermissionDelegate>(
             "GeckoViewPermission", this,
             new String[] {
                 "GeckoView:AndroidPermission",
                 "GeckoView:ContentPermission",
                 "GeckoView:MediaPermission"
-            }, /* alwaysListen */ true
+            }
         ) {
             @Override
             public void handleMessage(final PermissionDelegate delegate,
                                       final String event,
                                       final GeckoBundle message,
                                       final EventCallback callback) {
 
                 if (delegate == null) {

--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSessionHandler.java
@@ -15,63 +15,50 @@ import android.util.Log;
 
 /* package */ abstract class GeckoSessionHandler<Delegate>
     implements BundleEventListener {
 
     private static final String LOGTAG = "GeckoSessionHandler";
     private static final boolean DEBUG = false;
 
     private Delegate mDelegate;
-    private final boolean mAlwaysListen;
     private final String mModuleName;
     private final String[] mEvents;
 
 
     /* package */ GeckoSessionHandler(final String module,
                                       final GeckoSession session,
                                       final String[] events) {
-        this(module, session, events, /* alwaysListen */ false);
-    }
-
-    /* package */ GeckoSessionHandler(final String module,
-                                      final GeckoSession session,
-                                      final String[] events,
-                                      final boolean alwaysListen) {
         session.handlersCount++;
 
-        mAlwaysListen = alwaysListen;
         mModuleName = module;
         mEvents = events;
-
-        if (alwaysListen) {
-            register(session);
-        }
     }
 
     public Delegate getDelegate() {
         return mDelegate;
     }
 
     public void setDelegate(final Delegate delegate, final GeckoSession session) {
         if (mDelegate == delegate) {
             return;
         }
 
         final boolean unsettingOldDelegate = mDelegate != null &&
                                              delegate == null;
         final boolean settingNewDelegate = mDelegate == null &&
                                            delegate != null;
 
-        if (!mAlwaysListen && unsettingOldDelegate) {
+        if (unsettingOldDelegate) {
             unregister(session);
         }
 
         mDelegate = delegate;
 
-        if (!mAlwaysListen && settingNewDelegate) {
+        if (settingNewDelegate) {
             register(session);
         }
 
         // If session is not open, we will update module state during session opening.
         if (!session.isOpen()) {
             return;
         }