diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 3d843e78..3ee49d3d 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -2567,7 +2567,7 @@ Actor::Actor()
 	}
 
 	edict->s.eType = ET_MODELANIM;
-	edict->r.svFlags |= SVF_USE_CURRENT_ORIGIN;
+	edict->r.svFlags |= SVF_MONSTER;
 	edict->r.ownerNum = ENTITYNUM_NONE;
 	edict->clipmask = MASK_MONSTERSOLID;
 	setMoveType( MOVETYPE_WALK );
@@ -14460,7 +14460,7 @@ void Actor::BecomeCorpse
 	AddToBodyQue();
 
 	edict->r.contents = CONTENTS_TRIGGER;
-	edict->r.svFlags &= ~SVF_USE_CURRENT_ORIGIN;
+	edict->r.svFlags &= ~SVF_MONSTER;
 	setSolidType(SOLID_NOT);
 	movetype = MOVETYPE_NONE;
 	edict->s.renderfx &= ~RF_SHADOW;
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 67b30501..4e6aa9b4 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -392,7 +392,7 @@ void G_AddGEntity(gentity_t *edict, qboolean showentnums)
     }
 
     // remove the entity in case of invalid server flags
-    if ((edict->r.svFlags & SVF_NOTSINGLECLIENT) && (edict->r.svFlags & SVF_CAPSULE)) {
+    if ((edict->r.svFlags & SVF_SENDONCE) && (edict->r.svFlags & SVF_HIDEOWNER)) {
         ent->PostEvent(EV_Remove, 0);
     }
 
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 52fbe33a..6e04d707 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -43,23 +43,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define SVF_CLIENTMASK 0x00000002
 
 #define	SVF_BROADCAST			0x00000004	// send to all connected clients
-#define SVF_MONSTER					0x00000008	// set if the entity is a bot
-#define	SVF_PORTAL				0x00000040	// merge a second pvs at origin2 into snapshots
-#define	SVF_USE_CURRENT_ORIGIN	0x00000080	// entity->r.currentOrigin instead of entity->s.origin
-											// for link position (missiles and movers)
+#define SVF_SENDPVS				0x00000008
+#define	SVF_PORTAL				0x00000010	// merge a second pvs at origin2
+#define SVF_NOTSINGLECLIENT		0x00000040	// send entity to everyone but one client
+                                            // (entityShared_t->singleClient)
+#define SVF_MONSTER				0x00000080	// set if the entity is a bot into snapshots
 #define SVF_SINGLECLIENT		0x00000100	// only send to a single client (entityShared_t->singleClient)
-#define SVF_NOSERVERINFO		0x00000200	// don't send CS_SERVERINFO updates to this client
-											// so that it can be updated for ping tools without
-											// lagging clients
-#define SVF_CAPSULE				0x00000400	// use capsule for collision detection instead of bbox
-#define SVF_NOTSINGLECLIENT		0x00000800	// send entity to everyone but one client
-											// (entityShared_t->singleClient)
-
-#define SVF_USEBBOX				0x00001000
+#define SVF_USEBBOX				0x00000200
+#define SVF_NOFARPLANE			0x00000400
+#define SVF_NOSERVERINFO		0x00000800	// don't send CS_SERVERINFO updates to this client
+                                            // so that it can be updated for ping tools without
+                                            // lagging clients
 #define SVF_SENDONCE			0x00004000
 
 #define SVF_HIDEOWNER			0x00008000
-#define SVF_SENDPVS				0x00010000
 
 typedef struct gclient_s gclient_t;
 typedef struct dtiki_s dtiki_t;