diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp
index 62bb752b4..ca7bf19e4 100644
--- a/src/k_hud_track.cpp
+++ b/src/k_hud_track.cpp
@@ -261,7 +261,7 @@ void K_DrawTargetTracking(const TargetTracking& target)
 	}
 }
 
-bool is_player_tracking_target(const player_t *player = stplyr)
+bool is_player_tracking_target(player_t *player = stplyr)
 {
 	if ((gametyperules & (GTR_BUMPERS|GTR_CLOSERPLAYERS)) != (GTR_BUMPERS|GTR_CLOSERPLAYERS))
 	{
@@ -292,17 +292,7 @@ bool is_player_tracking_target(const player_t *player = stplyr)
 		return false;
 	}
 
-	if (g_hiscore < 1) // SOMEONE should be scoring
-	{
-		return false;
-	}
-
-	if (player->roundscore < g_hiscore)
-	{
-		return false;
-	}
-
-	return true;
+	return K_IsPlayerWanted(player);
 }
 
 bool is_object_tracking_target(const mobj_t* mobj)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5768ddf38..80f413216 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6391,6 +6391,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 					numx->destscale = scale;
 				}
 
+#if 0
 				if (K_IsPlayerWanted(mobj->target->player) && mobj->movecount != 1)
 				{
 					mobj_t *wanted = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PLAYERWANTED);
@@ -6401,6 +6402,7 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 					mobj->movecount = 1;
 				}
 				else if (!K_IsPlayerWanted(mobj->target->player))
+#endif
 					mobj->movecount = 0;
 			}
 			else