diff --git a/src/k_battle.c b/src/k_battle.c
index 085b63e52..913202637 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -293,13 +293,17 @@ static void K_SetupMovingCapsule(mapthing_t *mt, mobj_t *mobj)
 	mobj->movecount = target->health;
 	mobj->movefactor = speed;
 
-	if (backandforth)
-		mobj->cusval = 1;
+	if (backandforth) {
+		mobj->flags2 |= MF2_AMBUSH;
+	} else {
+		mobj->flags2 &= ~MF2_AMBUSH;
+	}
 
-	if (reverse)
+	if (reverse) {
 		mobj->cvmem = -1;
-	else
+	} else {
 		mobj->cvmem = 1;
+	}
 }
 
 void K_SpawnBattleCapsules(void)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 3f02c16e0..d994a017f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9377,7 +9377,7 @@ void P_MobjThinker(mobj_t *mobj)
 					fixed_t speed = mobj->movefactor;
 					UINT8 sequence = mobj->lastlook;
 					UINT8 num = mobj->movecount;
-					boolean backandforth = mobj->cusval;
+					boolean backandforth = (mobj->flags2 & MF2_AMBUSH);
 					SINT8 direction = mobj->cvmem;
 					mobj_t *next = NULL;
 					thinker_t *th;