diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
index 2752003..eded1c9 100644
--- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
@@ -26,10 +26,7 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.graphics.Point;
-import android.os.SystemClock;
 import android.util.Log;
-import android.view.MotionEvent;
 
 import androidx.test.uiautomator.UiDevice;
 
@@ -118,18 +115,6 @@
                 private void evaluateWithThreeButtons() throws Throwable {
                     if (setActiveOverlay(mLauncher, NAV_BAR_MODE_3BUTTON_OVERLAY,
                             LauncherInstrumentation.NavigationModel.THREE_BUTTON, description)) {
-                        // After switching to three button, ensure that we interact with the screen
-                        // within the app area to reset the frozen recents state (if a quickswitch
-                        // was just performed), otherwise the list may be in the wrong order
-                        // spatially when executing the next test
-                        final Point center = new Point(mLauncher.getDevice().getDisplayWidth() / 2,
-                                mLauncher.getDevice().getDisplayHeight() / 2);
-                        final long clickTime = SystemClock.uptimeMillis();
-                        mLauncher.sendPointer(clickTime, clickTime, MotionEvent.ACTION_DOWN, center,
-                                LauncherInstrumentation.GestureScope.DONT_EXPECT_PILFER);
-                        mLauncher.sendPointer(clickTime, clickTime, MotionEvent.ACTION_UP, center,
-                                LauncherInstrumentation.GestureScope.DONT_EXPECT_PILFER);
-
                         base.evaluate();
                     }
                 }
