diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index d18f81e..0ed781f 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -51,8 +51,6 @@
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
 
-    private static final int WIFI_P2P_DEBUG = SystemProperties.getInt("ro.debuggable", 0);
-
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
 
@@ -144,14 +142,10 @@
 
         if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
             getPreferenceScreen().removePreference(wifiP2p);
-            getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
         } else {
             mWifiP2pEnabler = new WifiP2pEnabler(activity, wifiP2p);
-            //Settings is used for debug alone
-            if (WIFI_P2P_DEBUG == 0) {
-                getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
-            }
         }
+        getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
 
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);