diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
index fbdc7596334..33b6a95868b 100644
--- a/src/com/android/settings/users/RestrictionUtils.java
+++ b/src/com/android/settings/users/RestrictionUtils.java
@@ -81,14 +81,6 @@ public class RestrictionUtils {
 
         for (RestrictionEntry entry : entries) {
             um.setUserRestriction(entry.getKey(), !entry.getSelectedState());
-
-            // TODO This will no longer be needed once b/23902097 is fixed. um.setUserRestriction
-            // should do it.
-            if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION)
-                    && !entry.getSelectedState()) {
-                Secure.putIntForUser(context.getContentResolver(),
-                        Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, user.getIdentifier());
-            }
         }
     }
 }