diff --git a/ChangeLog b/ChangeLog
index 6961a0556..e43f66c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-09  Elijah Newren  <newren@gmail.com>
+
+	* src/edge-resistance.c (apply_edge_resistance): Remove the
+	"pull-away" edge resistance.  Fixes another of the zillions of
+	issues covered in #321905.
+
 2006-01-09  Elijah Newren  <newren@gmail.com>
 
 	* src/edge-resistance.c (apply_edge_resistance): Revert to the old
diff --git a/src/edge-resistance.c b/src/edge-resistance.c
index 77c3a01a3..14a3e5717 100644
--- a/src/edge-resistance.c
+++ b/src/edge-resistance.c
@@ -333,11 +333,11 @@ apply_edge_resistance (MetaWindow                *window,
   int      increment = increasing ? 1 : -1;
 
   const int PIXEL_DISTANCE_THRESHOLD_TOWARDS_WINDOW    = 16;
-  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_WINDOW   =  8;
+  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_WINDOW   =  0;
   const int PIXEL_DISTANCE_THRESHOLD_TOWARDS_XINERAMA  = 32;
-  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_XINERAMA =  8;
+  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_XINERAMA =  0;
   const int PIXEL_DISTANCE_THRESHOLD_TOWARDS_SCREEN    = 32;
-  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_SCREEN   =  8;
+  const int PIXEL_DISTANCE_THRESHOLD_AWAYFROM_SCREEN   =  0;
   const int TIMEOUT_RESISTANCE_LENGTH_MS_WINDOW   =   0;
   const int TIMEOUT_RESISTANCE_LENGTH_MS_XINERAMA =   0;
   const int TIMEOUT_RESISTANCE_LENGTH_MS_SCREEN   =   0;