diff --git a/ChangeLog b/ChangeLog
index b6894aae73..2701d86dc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
 	  suspend events around the Commit(). Fixes #347089 when combined
 	  with r14495.
 
+	* src/gnome/druid-acct-period.c:
+	* src/gnome/gnc-plugin-page-account-tree.c:
+	* src/gnome/window-reconcile.c:
+	  disable lot scrubbing during Check & Repair (#357370).
+	  Lots are supposed to be disabled in the 2.0 release until we
+	  get the cap-gains code working.  IMHO the cap-gains code should
+	  deal with extra txn splits instead of creating additional txns.
+
 2006-09-19  Christian Stimming  <stimming@tuhh.de>
 
 	* configure.in: Remove mt940 module completely from the build and
diff --git a/src/gnome/druid-acct-period.c b/src/gnome/druid-acct-period.c
index 126d13aabe..bdec3736b7 100644
--- a/src/gnome/druid-acct-period.c
+++ b/src/gnome/druid-acct-period.c
@@ -393,7 +393,8 @@ scrub_all(void)
   AccountGroup *group = gnc_get_current_group ();
   xaccGroupScrubOrphans (group);
   xaccGroupScrubImbalance (group);
-  xaccGroupScrubLots (group);
+  // XXX: Lots are disabled
+  //xaccGroupScrubLots (group);
 }
 
 /* =============================================================== */
diff --git a/src/gnome/gnc-plugin-page-account-tree.c b/src/gnome/gnc-plugin-page-account-tree.c
index 6e6334abc0..f98aab04bd 100644
--- a/src/gnome/gnc-plugin-page-account-tree.c
+++ b/src/gnome/gnc-plugin-page-account-tree.c
@@ -1168,7 +1168,8 @@ gnc_plugin_page_account_tree_cmd_scrub (GtkAction *action, GncPluginPageAccountT
 	xaccAccountScrubOrphans (account);
 	xaccAccountScrubImbalance (account);
 
-	xaccAccountScrubLots (account);
+	// XXX: Lots are disabled
+	//xaccAccountScrubLots (account);
 
 	gnc_resume_gui_refresh ();
 }
@@ -1185,7 +1186,8 @@ gnc_plugin_page_account_tree_cmd_scrub_sub (GtkAction *action, GncPluginPageAcco
 	xaccAccountTreeScrubOrphans (account);
 	xaccAccountTreeScrubImbalance (account);
 
-	xaccAccountTreeScrubLots (account);
+	// XXX: Lots are disabled
+	//xaccAccountTreeScrubLots (account);
 
 	gnc_resume_gui_refresh ();
 }
@@ -1200,7 +1202,8 @@ gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAcco
 	xaccGroupScrubOrphans (group);
 	xaccGroupScrubImbalance (group);
 
-	xaccGroupScrubLots (group);
+	// XXX: Lots are disabled
+	//xaccGroupScrubLots (group);
 
 	gnc_resume_gui_refresh ();
 }
diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c
index c03c6a5f3e..5992c705a7 100644
--- a/src/gnome/window-reconcile.c
+++ b/src/gnome/window-reconcile.c
@@ -1228,7 +1228,8 @@ gnc_recn_scrub_cb(GtkAction *action, gpointer data)
   xaccAccountTreeScrubOrphans (account);
   xaccAccountTreeScrubImbalance (account);
 
-  xaccAccountTreeScrubLots (account);
+  // XXX: Lots are disabled.
+  //xaccAccountTreeScrubLots (account);
 
   gnc_resume_gui_refresh ();
 }