diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index a3c956e..b4d2d90 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -61,14 +61,14 @@
             android:defaultValue="@string/voice_mode_main"
             />
 
-    <ListPreference
+    <!-- <ListPreference
             android:key="keyboard_layout"
             android:title="@string/keyboard_layout"
             android:persistent="true"
             android:entryValues="@array/keyboard_layout_modes_values"
             android:entries="@array/keyboard_layout_modes"
             android:defaultValue="4"
-            />
+            />-->
 
     <PreferenceScreen
             android:title="@string/language_selection_title"
diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 223198b..9c0a5a3 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -45,7 +45,7 @@
     public static final int KEYBOARDMODE_WEB = R.id.mode_webentry;
 
     public static final String DEFAULT_LAYOUT_ID = "4";
-    public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout";
+    public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902";
     private static final int[] THEMES = new int [] {
         R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal,
         R.layout.input_stone_bold, R.layout.input_gingerbread};