--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1582,19 +1582,17 @@ public abstract class GeckoApp
         }
 
         mContactService = new ContactService(EventDispatcher.getInstance(), this);
 
         mPromptService = new PromptService(this);
 
         mTextSelection = new TextSelection((TextSelectionHandle) findViewById(R.id.anchor_handle),
                                            (TextSelectionHandle) findViewById(R.id.caret_handle),
-                                           (TextSelectionHandle) findViewById(R.id.focus_handle),
-                                           EventDispatcher.getInstance(),
-                                           this);
+                                           (TextSelectionHandle) findViewById(R.id.focus_handle));
 
         PrefsHelper.getPref("app.update.autodownload", new PrefsHelper.PrefHandlerBase() {
             @Override public void prefValue(String pref, String value) {
                 UpdateServiceHelper.registerForUpdates(GeckoApp.this, value);
             }
         });
 
         // Trigger the completion of the telemetry timer that wraps activity startup,

--- a/mobile/android/base/TextSelection.java
+++ b/mobile/android/base/TextSelection.java
@@ -34,17 +34,16 @@ import android.util.Log;
 import android.view.View;
 
 class TextSelection extends Layer implements GeckoEventListener {
     private static final String LOGTAG = "GeckoTextSelection";
 
     private final TextSelectionHandle anchorHandle;
     private final TextSelectionHandle caretHandle;
     private final TextSelectionHandle focusHandle;
-    private final EventDispatcher eventDispatcher;
 
     private final DrawListener mDrawListener;
     private boolean mDraggingHandles;
 
     private float mViewLeft;
     private float mViewTop;
     private float mViewZoom;
 
@@ -65,23 +64,20 @@ class TextSelection extends Layer implem
                 }
             });
         }
     };
     private ActionModeTimerTask mActionModeTimerTask;
 
     TextSelection(TextSelectionHandle anchorHandle,
                   TextSelectionHandle caretHandle,
-                  TextSelectionHandle focusHandle,
-                  EventDispatcher eventDispatcher,
-                  GeckoApp activity) {
+                  TextSelectionHandle focusHandle) {
         this.anchorHandle = anchorHandle;
         this.caretHandle = caretHandle;
         this.focusHandle = focusHandle;
-        this.eventDispatcher = eventDispatcher;
 
         mDrawListener = new DrawListener() {
             @Override
             public void drawFinished() {
                 if (!mDraggingHandles) {
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:LayerReflow", ""));
                 }
             }