diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 9a2d14a..396e5fa 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -218,51 +218,6 @@
         return R.string.help_url_backup_reset;
     }
 
-    private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
-        private final Context mContext;
-        private final SummaryLoader mSummaryLoader;
-
-        public SummaryProvider(Context context, SummaryLoader summaryLoader) {
-            mContext = context;
-            mSummaryLoader = summaryLoader;
-        }
-
-        @Override
-        public void setListening(boolean listening) {
-            if (listening) {
-                IBackupManager backupManager = IBackupManager.Stub.asInterface(
-                        ServiceManager.getService(Context.BACKUP_SERVICE));
-                try {
-                    boolean backupEnabled = backupManager.isBackupEnabled();
-                    if (backupEnabled) {
-                        String transport = backupManager.getCurrentTransport();
-                        String configSummary = backupManager.getDestinationString(transport);
-                        if (configSummary != null) {
-                            mSummaryLoader.setSummary(this, configSummary);
-                        } else {
-                            mSummaryLoader.setSummary(this, mContext.getString(
-                                    R.string.backup_configure_account_default_summary));
-                        }
-                    } else {
-                        mSummaryLoader.setSummary(this, mContext.getString(
-                                R.string.backup_disabled));
-                    }
-                } catch (RemoteException e) {
-                }
-            }
-        }
-    }
-
-    public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
-            = new SummaryLoader.SummaryProviderFactory() {
-        @Override
-        public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
-                                                                   SummaryLoader summaryLoader) {
-            return new SummaryProvider(activity, summaryLoader);
-        }
-    };
-
     /**
      * For Search.
      */
