diff --git a/res/menu/activity_main_drawer.xml b/res/menu/activity_main_drawer.xml
index 469a7b8..2a69763 100644
--- a/res/menu/activity_main_drawer.xml
+++ b/res/menu/activity_main_drawer.xml
@@ -28,10 +28,6 @@
             android:icon="@drawable/ic_menu_import_export"
             android:title="@string/menu_import_export"/>
         <item
-            android:id="@+id/nav_accounts"
-            android:icon="@drawable/ic_account_circle_black_24dp"
-            android:title="@string/menu_accounts"/>
-        <item
             android:id="@+id/nav_blocked_numbers"
             android:icon="@drawable/ic_menu_blocked_numbers"
             android:title="@string/menu_blocked_numbers"/>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 5b2d52a..c1a3018 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -29,11 +29,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.ProviderStatus;
 import android.provider.ContactsContract.QuickContact;
-import android.provider.Settings;
 import android.support.design.widget.NavigationView;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.GravityCompat;
@@ -1209,13 +1207,6 @@
                     mContactListFilterController.getFilter());
         } else if (id == R.id.nav_import_export) {
             showImportExportDialogFragment();
-        } else if (id == R.id.nav_accounts) {
-            final Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
-            intent.putExtra(Settings.EXTRA_AUTHORITIES, new String[] {
-                    ContactsContract.AUTHORITY
-            });
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-            ImplicitIntentsUtil.startActivityInAppIfPossible(this, intent);
         } else if (id == R.id.nav_blocked_numbers) {
             final Intent intent = TelecomManagerUtil.createManageBlockedNumbersIntent(
                     (TelecomManager) getSystemService(Context.TELECOM_SERVICE));
