diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml
index 9c4b618..25615e0 100644
--- a/quickstep/res/layout/overview_clear_all_button.xml
+++ b/quickstep/res/layout/overview_clear_all_button.xml
@@ -11,4 +11,5 @@
     android:textColor="?attr/workspaceTextColor"
     android:visibility="invisible"
     android:textSize="14sp"
+    android:importantForAccessibility="no"
 />
\ No newline at end of file
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index f3a0e4f..d5c43a0 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.Button;
 
 public class ClearAllButton extends Button {
@@ -37,14 +36,6 @@
     }
 
     @Override
-    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
-        super.onInitializeAccessibilityNodeInfo(info);
-        // Should be visible to accessibility even when completely covered by the task.
-        // Otherwise, we won't be able to scroll to it.
-        info.setVisibleToUser(true);
-    }
-
-    @Override
     public boolean performAccessibilityAction(int action, Bundle arguments) {
         final boolean res = super.performAccessibilityAction(action, arguments);
         if (action == ACTION_ACCESSIBILITY_FOCUS) {
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index aeff476..4a8c628 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1303,8 +1303,6 @@
 
     private void onChildViewsChanged() {
         final int childCount = getChildCount();
-        mClearAllButton.setAccessibilityTraversalAfter(
-                childCount == 0 ? NO_ID : getChildAt(childCount - 1).getId());
         mClearAllButton.setVisibility(childCount == 0 ? INVISIBLE : VISIBLE);
     }