diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c29e74f..b1d8355 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3543,7 +3543,7 @@
         int count = orderedScreenIds.size();
         for (int i = 0; i < count; i++) {
             Log.w(TAG, "10249126 - bindAddScreens(" + orderedScreenIds.get(i) + ")");
-            mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(orderedScreenIds.get(i), false);
+            mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(orderedScreenIds.get(i));
         }
     }
 
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 77f726a..81d7641 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -461,26 +461,22 @@
         return mTouchState != TOUCH_STATE_REST;
     }
 
-    public long insertNewWorkspaceScreen(long screenId) {
-        return insertNewWorkspaceScreen(screenId, getChildCount(), true);
-    }
-
-    public long insertNewWorkspaceScreenBeforeEmptyScreen(long screenId, boolean updateDb) {
+    public long insertNewWorkspaceScreenBeforeEmptyScreen(long screenId) {
         // Find the index to insert this view into.  If the empty screen exists, then
         // insert it before that.
         int insertIndex = mScreenOrder.indexOf(EXTRA_EMPTY_SCREEN_ID);
         if (insertIndex < 0) {
             insertIndex = mScreenOrder.size();
         }
-        return insertNewWorkspaceScreen(screenId, insertIndex, updateDb);
+        return insertNewWorkspaceScreen(screenId, insertIndex);
     }
 
-    public long insertNewWorkspaceScreen(long screenId, boolean updateDb) {
-        return insertNewWorkspaceScreen(screenId, getChildCount(), updateDb);
+    public long insertNewWorkspaceScreen(long screenId) {
+        return insertNewWorkspaceScreen(screenId, getChildCount());
     }
 
-    public long insertNewWorkspaceScreen(long screenId, int insertIndex, boolean updateDb) {
-        Log.w(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ", " + updateDb + ")");
+    public long insertNewWorkspaceScreen(long screenId, int insertIndex) {
+        Log.w(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ")");
         CellLayout newScreen = (CellLayout)
                 mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
 
@@ -489,10 +485,6 @@
         mWorkspaceScreens.put(screenId, newScreen);
         mScreenOrder.add(insertIndex, screenId);
         addView(newScreen, insertIndex);
-        if (updateDb) {
-            // On bind we don't need to update the screens in the database.
-            mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
-        }
         return screenId;
     }
 
@@ -550,7 +542,7 @@
     }
 
     public void addExtraEmptyScreen() {
-        insertNewWorkspaceScreen(EXTRA_EMPTY_SCREEN_ID, false);
+        insertNewWorkspaceScreen(EXTRA_EMPTY_SCREEN_ID);
     }
 
     public CellLayout getScreenWithId(long screenId) {
