diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cbff3ae..f8fccae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -242,6 +242,13 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
             </intent-filter>
 
             <meta-data android:name="android.app.searchable"
@@ -311,24 +318,6 @@
             </intent-filter>
         </activity>
 
-        <!-- The contacts search/filter UI -->
-        <activity android:name=".activities.ContactSearchActivity"
-            android:theme="@style/ContactsSearchTheme"
-            android:windowSoftInputMode="stateAlwaysVisible"
-        >
-            <intent-filter>
-                <action android:name="com.android.contacts.action.FILTER_CONTACTS" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="vnd.android.cursor.dir/contact" android:host="com.android.contacts" />
-            </intent-filter>
-
-        </activity>
-
-        <!-- The contacts search/filter UI -->
-        <activity-alias android:name="SearchResultsActivity"
-            android:targetActivity=".activities.ContactBrowserActivity">
-        </activity-alias>
-
         <!-- Used to set options -->
         <activity
             android:name=".preference.ContactsPreferenceActivity"
diff --git a/src/com/android/contacts/activities/ContactSearchActivity.java b/src/com/android/contacts/activities/ContactSearchActivity.java
deleted file mode 100644
index 615f182..0000000
--- a/src/com/android/contacts/activities/ContactSearchActivity.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.activities;
-
-import com.android.contacts.R;
-import com.android.contacts.interactions.ContactDeletionInteraction;
-import com.android.contacts.interactions.PhoneNumberInteraction;
-import com.android.contacts.list.ContactBrowseListContextMenuAdapter;
-import com.android.contacts.list.ContactBrowseListFragment;
-import com.android.contacts.list.ContactsIntentResolver;
-import com.android.contacts.list.ContactsRequest;
-import com.android.contacts.list.DefaultContactBrowseListFragment;
-import com.android.contacts.list.DirectoryListLoader;
-import com.android.contacts.list.OnContactBrowserActionListener;
-import com.android.contacts.widget.SearchEditText;
-import com.android.contacts.widget.SearchEditText.OnFilterTextListener;
-
-import android.app.Activity;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract.Contacts;
-
-public class ContactSearchActivity extends Activity {
-
-    private ContactsIntentResolver mIntentResolver;
-    private ContactsRequest mRequest;
-    private ContactBrowseListFragment mListFragment;
-    private PhoneNumberInteraction mPhoneNumberCallInteraction;
-    private PhoneNumberInteraction mSendTextMessageInteraction;
-    private ContactDeletionInteraction mContactDeletionInteraction;
-    private SearchEditText mSearchEditText;
-
-    public ContactSearchActivity() {
-        mIntentResolver = new ContactsIntentResolver(this);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedState) {
-        super.onCreate(savedState);
-
-        // Extract relevant information from the intent
-        mRequest = mIntentResolver.resolveIntent(getIntent());
-        if (!mRequest.isValid()) {
-            setResult(RESULT_CANCELED);
-            finish();
-            return;
-        }
-
-        setTitle(mRequest.getActivityTitle());
-
-        setContentView(R.layout.contacts_search_content);
-
-        if (mListFragment == null) {
-            mListFragment = createContactSearchFragment();
-            getFragmentManager().openTransaction()
-                    .replace(R.id.list_container, mListFragment)
-                    .commit();
-        }
-
-        mSearchEditText = (SearchEditText)findViewById(R.id.search_src_text);
-        mSearchEditText.setText(mRequest.getQueryString());
-        mSearchEditText.setOnFilterTextListener(new OnFilterTextListener() {
-            @Override
-            public void onFilterChange(String queryString) {
-                mListFragment.setQueryString(queryString);
-            }
-
-            @Override
-            public void onCancelSearch() {
-                finish();
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mSearchEditText.requestFocus();
-    }
-
-
-    private ContactBrowseListFragment createContactSearchFragment() {
-        DefaultContactBrowseListFragment fragment = new DefaultContactBrowseListFragment();
-        fragment.setOnContactListActionListener(new ContactBrowserActionListener());
-        fragment.setContextMenuAdapter(new ContactBrowseListContextMenuAdapter(fragment));
-        fragment.setSearchMode(true);
-        fragment.setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);
-        fragment.setAizyEnabled(false);
-        fragment.setSelectionVisible(true);
-        return fragment;
-    }
-
-    private final class ContactBrowserActionListener implements OnContactBrowserActionListener {
-        @Override
-        public void onViewContactAction(Uri contactLookupUri) {
-            startActivity(new Intent(Intent.ACTION_VIEW, contactLookupUri));
-        }
-
-        @Override
-        public void onCreateNewContactAction() {
-        }
-
-        @Override
-        public void onEditContactAction(Uri contactLookupUri) {
-            Intent intent = new Intent(Intent.ACTION_EDIT, contactLookupUri);
-            Bundle extras = getIntent().getExtras();
-            if (extras != null) {
-                intent.putExtras(extras);
-            }
-            startActivity(intent);
-        }
-
-        @Override
-        public void onAddToFavoritesAction(Uri contactUri) {
-            ContentValues values = new ContentValues(1);
-            values.put(Contacts.STARRED, 1);
-            getContentResolver().update(contactUri, values, null, null);
-        }
-
-        @Override
-        public void onRemoveFromFavoritesAction(Uri contactUri) {
-            ContentValues values = new ContentValues(1);
-            values.put(Contacts.STARRED, 0);
-            getContentResolver().update(contactUri, values, null, null);
-        }
-
-        @Override
-        public void onCallContactAction(Uri contactUri) {
-            getPhoneNumberCallInteraction().startInteraction(contactUri);
-        }
-
-        @Override
-        public void onSmsContactAction(Uri contactUri) {
-            getSendTextMessageInteraction().startInteraction(contactUri);
-        }
-
-        @Override
-        public void onDeleteContactAction(Uri contactUri) {
-            getContactDeletionInteraction().deleteContact(contactUri);
-        }
-
-        @Override
-        public void onFinishAction() {
-            onBackPressed();
-        }
-
-        @Override
-        public void onInvalidSelection() {
-        }
-    }
-
-    private PhoneNumberInteraction getPhoneNumberCallInteraction() {
-        if (mPhoneNumberCallInteraction == null) {
-            mPhoneNumberCallInteraction = new PhoneNumberInteraction(this, false, null);
-        }
-        return mPhoneNumberCallInteraction;
-    }
-
-    private PhoneNumberInteraction getSendTextMessageInteraction() {
-        if (mSendTextMessageInteraction == null) {
-            mSendTextMessageInteraction = new PhoneNumberInteraction(this, true, null);
-        }
-        return mSendTextMessageInteraction;
-    }
-
-    private ContactDeletionInteraction getContactDeletionInteraction() {
-        if (mContactDeletionInteraction == null) {
-            mContactDeletionInteraction = new ContactDeletionInteraction();
-            mContactDeletionInteraction.attachToActivity(this);
-        }
-        return mContactDeletionInteraction;
-    }
-}
diff --git a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
index 4cc9cc8..9d7f926 100644
--- a/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
+++ b/tests/src/com/android/contacts/tests/allintents/AllIntentsActivity.java
@@ -60,8 +60,6 @@
 
     private static final String CONTACT_LIST_ACTIVITY_CLASS_NAME =
             "com.android.contacts.activities.ContactBrowserActivity";
-    private static final String SEARCH_RESULTS_ACTIVITY_CLASS_NAME =
-            "com.android.contacts.SearchResultsActivity";
     private static final String MULTIPLE_PHONE_PICKER_ACTIVITY_CLASS_NAME =
             "com.android.contacts.MultiplePhonePickerActivity";
 
@@ -331,19 +329,16 @@
             case ACTION_SEARCH_CONTACT: {
                 Intent intent = new Intent(Intent.ACTION_SEARCH);
                 intent.putExtra(SearchManager.QUERY, "a");
+                intent.setType(Contacts.CONTENT_TYPE);
                 startSearchResultActivity(intent);
                 break;
             }
             case ACTION_SEARCH_EMAIL: {
-                Intent intent = new Intent(Intent.ACTION_SEARCH);
-                intent.putExtra(Insert.EMAIL, "a");
-                startSearchResultActivity(intent);
+                Toast.makeText(this, "Unsupported", Toast.LENGTH_SHORT).show();
                 break;
             }
             case ACTION_SEARCH_PHONE: {
-                Intent intent = new Intent(Intent.ACTION_SEARCH);
-                intent.putExtra(Insert.PHONE, "800");
-                startSearchResultActivity(intent);
+                Toast.makeText(this, "Unsupported", Toast.LENGTH_SHORT).show();
                 break;
             }
             case SEARCH_SUGGESTION_CLICKED_CALL_BUTTON: {
@@ -574,8 +569,6 @@
     }
 
     private void startSearchResultActivity(Intent intent) {
-        intent.setComponent(
-                new ComponentName(ANDROID_CONTACTS_PACKAGE, SEARCH_RESULTS_ACTIVITY_CLASS_NAME));
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
     }