diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 7aa10534e85..317d372c8e5 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -292,7 +292,6 @@ public class ChooseLockGeneric extends SettingsActivity {
         /** increases the quality if necessary */
         private int upgradeQuality(int quality) {
             quality = upgradeQualityForDPM(quality);
-            quality = upgradeQualityForKeyStore(quality);
             return quality;
         }
 
@@ -305,15 +304,6 @@ public class ChooseLockGeneric extends SettingsActivity {
             return quality;
         }
 
-        private int upgradeQualityForKeyStore(int quality) {
-            if (!mKeyStore.isEmpty()) {
-                if (quality < CredentialStorage.MIN_PASSWORD_QUALITY) {
-                    quality = CredentialStorage.MIN_PASSWORD_QUALITY;
-                }
-            }
-            return quality;
-        }
-
         /***
          * Disables preferences that are less secure than required quality. The actual
          * implementation is in disableUnusablePreferenceImpl.