Index: trunk/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 24421)
+++ trunk/ippTools/share/Makefile.am	(revision 24422)
@@ -222,5 +222,5 @@
      warptool_pendingcleanuprun.sql \
      warptool_pendingcleanupskyfile.sql \
-     warptool_revertwarped_update.sql \
+     warptool_revertoverlap.sql \
      warptool_revertwarped_delete.sql \
      warptool_scmap.sql \
Index: trunk/ippTools/share/disttool_pendingfileset.sql
===================================================================
--- trunk/ippTools/share/disttool_pendingfileset.sql	(revision 24421)
+++ trunk/ippTools/share/disttool_pendingfileset.sql	(revision 24422)
@@ -16,3 +16,6 @@
 LEFT JOIN rcDSFileset USING(prod_id, dist_id)
 WHERE distRun.state = 'full'
+    AND rcDestination.state = 'enabled'
+    AND distTarget.state = 'enabled'
+    AND rcInterest.state = 'enabled'
     AND rcDSFileset.fs_id IS NULL
Index: trunk/ippTools/share/warptool_revertoveralp.sql
===================================================================
--- trunk/ippTools/share/warptool_revertoveralp.sql	(revision 24422)
+++ trunk/ippTools/share/warptool_revertoveralp.sql	(revision 24422)
@@ -0,0 +1,10 @@
+DELETE FROM warpSkyCellMap
+USING warpSkyCellMap, warpRun, fakeRun, camRun, chipRun, rawExp
+WHERE warpSkyCellMap.warp_id = warpRun.warp_id
+    AND warpRun.fake_id = fakeRun.fake_id
+    AND fakeRun.cam_id = camRun.cam_id
+    AND camRun.chip_id = chipRun.chip_id
+    AND chipRun.exp_id = rawExp.exp_id
+    AND warpRun.state = 'new'
+    AND warpSkyCellMap.fault != 0
+