diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fdbfd157fcb..b82d931f799 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1073,15 +1073,6 @@
             android:label="@string/header_add_an_account"
             android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
-        <activity android:name="com.android.settings.accounts.SyncActivityTooManyDeletes"
-                  android:theme="@android:style/Theme.Holo.Dialog"
-                  android:label="@string/sync_too_many_deletes">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title" android:exported="false">
             <intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2b7ccb2537f..e1f0f96b85b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3052,8 +3052,6 @@ found in the list of installed applications.</string>
 
     <!-- Title of the feed synchronization activity. -->
     <string name="app_label">Account and Sync Settings</string>
-    <!-- Error message when the sync tried to delete too many things -->
-    <string name="sync_too_many_deletes">Delete limit exceeded</string>
     <!-- Data synchronization settings screen, setting option name -->
     <string name="settings_backup">Back up settings</string>
     <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
@@ -3070,14 +3068,6 @@ found in the list of installed applications.</string>
     <string name="sync_calendar">Calendar</string>
     <!-- Data synchronization settings screen, checkbox setting option name -->
     <string name="sync_contacts">Contacts</string>
-    <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
-    <string name="sync_too_many_deletes_desc">There are <xliff:g id="number_of_deleted_items">%1$d</xliff:g> deleted items for <xliff:g id="type_of_sync">%2$s</xliff:g>, account <xliff:g id="account_name">%3$s</xliff:g>. What would you like to do?</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
-    <string name="sync_really_delete">Delete the items.</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
-    <string name="sync_undo_deletes">Undo the deletes.</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
-    <string name="sync_do_nothing">Do nothing for now.</string>
     <!-- Message introducing the user to Google Sync. -->
     <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google sync!</font>
     \nA Google approach to synchronizing data to allow access to your contacts, appointments, and more from wherever you are.
diff --git a/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java b/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java
deleted file mode 100644
index b31561cc160..00000000000
--- a/src/com/android/settings/accounts/SyncActivityTooManyDeletes.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2007 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.settings.accounts;
-
-import com.android.settings.R;
-
-import android.accounts.Account;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-/**
- * Presents multiple options for handling the case where a sync was aborted because there
- * were too many pending deletes. One option is to force the delete, another is to rollback
- * the deletes, the third is to do nothing.
- */
-public class SyncActivityTooManyDeletes extends Activity
-        implements AdapterView.OnItemClickListener {
-
-    private long mNumDeletes;
-    private Account mAccount;
-    private String mAuthority;
-    private String mProvider;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle extras = getIntent().getExtras();
-        if (extras == null) {
-            finish();
-            return;
-        }
-
-        mNumDeletes = extras.getLong("numDeletes");
-        mAccount = (Account) extras.getParcelable("account");
-        mAuthority = extras.getString("authority");
-        mProvider = extras.getString("provider");
-
-        // the order of these must match up with the constants for position used in onItemClick
-        CharSequence[] options = new CharSequence[]{
-                getResources().getText(R.string.sync_really_delete),
-                getResources().getText(R.string.sync_undo_deletes),
-                getResources().getText(R.string.sync_do_nothing)
-        };
-
-        ListAdapter adapter = new ArrayAdapter<CharSequence>(this,
-                android.R.layout.simple_list_item_1,
-                android.R.id.text1,
-                options);
-
-        ListView listView = new ListView(this);
-        listView.setAdapter(adapter);
-        listView.setItemsCanFocus(true);
-        listView.setOnItemClickListener(this);
-
-        TextView textView = new TextView(this);
-        CharSequence tooManyDeletesDescFormat =
-                getResources().getText(R.string.sync_too_many_deletes_desc);
-        textView.setText(String.format(tooManyDeletesDescFormat.toString(),
-                mNumDeletes, mProvider, mAccount.name));
-
-        final LinearLayout ll = new LinearLayout(this);
-        ll.setOrientation(LinearLayout.VERTICAL);
-        final LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0);
-        ll.addView(textView, lp);
-        ll.addView(listView, lp);
-
-        // TODO: consider displaying the icon of the account type
-//        AuthenticatorDescription[] descs = AccountManager.get(this).getAuthenticatorTypes();
-//        for (AuthenticatorDescription desc : descs) {
-//            if (desc.type.equals(mAccount.type)) {
-//                try {
-//                    final Context authContext = createPackageContext(desc.packageName, 0);
-//                    ImageView imageView = new ImageView(this);
-//                    imageView.setImageDrawable(authContext.getResources().getDrawable(desc.iconId));
-//                    ll.addView(imageView, lp);
-//                } catch (PackageManager.NameNotFoundException e) {
-//                }
-//                break;
-//            }
-//        }
-
-        setContentView(ll);
-    }
-
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        // the constants for position correspond to the items options array in onCreate()
-        if (position == 0) startSyncReallyDelete();
-        else if (position == 1) startSyncUndoDeletes();
-        finish();
-    }
-
-    private void startSyncReallyDelete() {
-        Bundle extras = new Bundle();
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_OVERRIDE_TOO_MANY_DELETIONS, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true);
-        ContentResolver.requestSync(mAccount, mAuthority, extras);
-    }
-
-    private void startSyncUndoDeletes() {
-        Bundle extras = new Bundle();
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_DISCARD_LOCAL_DELETIONS, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
-        extras.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true);
-        ContentResolver.requestSync(mAccount, mAuthority, extras);
-    }
-}