diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index dc36220..9ac9ef8 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -878,7 +878,6 @@
 
         private LockscreenCredential mChosenPattern;
         private LockscreenCredential mCurrentCredential;
-        private boolean mLockVirgin;
 
         public void start(LockPatternUtils utils, boolean requestGatekeeperPassword,
                 LockscreenCredential chosenPattern, LockscreenCredential currentCredential,
@@ -890,8 +889,6 @@
             mChosenPattern = chosenPattern;
             mUserId = userId;
 
-            mLockVirgin = !mUtils.isPatternEverChosen(mUserId);
-
             start();
         }
 
@@ -922,14 +919,5 @@
             }
             return Pair.create(success, result);
         }
-
-        @Override
-        protected void finish(Intent resultData) {
-            if (mLockVirgin) {
-                mUtils.setVisiblePatternEnabled(true, mUserId);
-            }
-
-            super.finish(resultData);
-        }
     }
 }
