diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index fb7b0ea40..cbfc3c39d 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -64,13 +64,6 @@
             android:key="subtype_settings"
             android:title="@string/language_selection_title"
             android:summary="@string/language_selection_summary" />
-        <PreferenceScreen
-            android:key="language_selection"
-            android:title="@string/language_selection_title"
-            android:summary="@string/language_selection_summary">
-            <intent
-                    android:action="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
-        </PreferenceScreen>
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/prediction_category"
diff --git a/java/src/com/android/inputmethod/compat/CompatUtils.java b/java/src/com/android/inputmethod/compat/CompatUtils.java
index f06760e8a..0b532f7f0 100644
--- a/java/src/com/android/inputmethod/compat/CompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/CompatUtils.java
@@ -40,8 +40,9 @@ public class CompatUtils {
             int flagsForSubtypeSettings) {
         final String action;
         Intent intent;
-        if (android.os.Build.VERSION.SDK_INT
-                >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 11) {
+        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED
+                /* android.os.Build.VERSION_CODES.HONEYCOMB */
+                && android.os.Build.VERSION.SDK_INT >=  11) {
             // Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
             action = INPUT_METHOD_SUBTYPE_SETTINGS;
             intent = new Intent(action);
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 1725ee7aa..6a0b7b009 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -68,7 +68,6 @@ public class Settings extends PreferenceActivity
     public static final String PREF_AUTO_CORRECTION_THRESHOLD = "auto_correction_threshold";
     public static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
     public static final String PREF_DEBUG_SETTINGS = "debug_settings";
-    public static final String PREF_LANGUAGE_SELECTION = "language_selection";
 
     public static final String PREF_USABILITY_STUDY_MODE = "usability_study_mode";
 
@@ -152,7 +151,8 @@ public class Settings extends PreferenceActivity
 
         final boolean showSubtypeSettings = getResources().getBoolean(
                 R.bool.config_enable_show_subtype_settings);
-        if (!showSubtypeSettings) {
+        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED
+                && !showSubtypeSettings) {
             generalSettings.removePreference(findPreference(PREF_SUBTYPES));
         }
 
@@ -185,10 +185,6 @@ public class Settings extends PreferenceActivity
         if (!showUsabilityModeStudyOption) {
             getPreferenceScreen().removePreference(findPreference(PREF_USABILITY_STUDY_MODE));
         }
-
-        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {
-            generalSettings.removePreference(findPreference(PREF_LANGUAGE_SELECTION));
-        }
     }
 
     @Override