diff --git a/source/core/actorinfo.h b/source/core/actorinfo.h
index f4eacbe04..a53721885 100644
--- a/source/core/actorinfo.h
+++ b/source/core/actorinfo.h
@@ -32,6 +32,10 @@ struct FActorInfo
 	int NumMoves = 0;
 	int FirstAI = -1;
 	int NumAIs = 0;
+	FName DefaultAction = NAME_Null;	// 'none' is valíd content here so use 'null' as 'not set'.
+	FName DefaultMove = NAME_Null;
+	int DefaultMoveflags = 0;
+
 	int DefaultFlags = 0;
 	int DefaultCstat = 0;
 	FName DamageType = NAME_None;	// damage type this item inflicts
diff --git a/source/core/thingdef.h b/source/core/thingdef.h
index 94a3c0e2b..746cca577 100644
--- a/source/core/thingdef.h
+++ b/source/core/thingdef.h
@@ -100,9 +100,6 @@ struct Baggage
 	PClassActor *Info;
 	int Lumpnum;
 	VersionInfo Version;
-	FName DefaultAction;
-	FName DefaultMove;
-	int moveflags;
 
 	FScriptPosition ScriptPosition;
 };
diff --git a/source/core/zcc_compile_raze.cpp b/source/core/zcc_compile_raze.cpp
index e711f7a57..1e8406ae1 100644
--- a/source/core/zcc_compile_raze.cpp
+++ b/source/core/zcc_compile_raze.cpp
@@ -674,8 +674,6 @@ void ZCCRazeCompiler::InitDefaults()
 				bag.Namespace = OutNamespace;
 				bag.Info = ti;
 				bag.Lumpnum = c->cls->SourceLump;
-				bag.DefaultAction = NAME_Null;	// 'none' is valíd content here so use 'null' as 'not set'.
-				bag.DefaultMove = NAME_Null;
 				// The actual script position needs to be set per property.
 
 				for (auto d : c->Defaults)
diff --git a/source/games/duke/src/game.cpp b/source/games/duke/src/game.cpp
index 59a16dfcd..b906c8481 100644
--- a/source/games/duke/src/game.cpp
+++ b/source/games/duke/src/game.cpp
@@ -836,19 +836,19 @@ DEFINE_PROPERTY(ai, SSSi, DukeActor)
 DEFINE_PROPERTY(startaction, S, DukeActor)
 {
 	PROP_STRING_PARM(n, 0);
-	bag.DefaultAction = n;
+	info->ActorInfo()->DefaultAction = n;
 }
 
 DEFINE_PROPERTY(startmove, S, DukeActor)
 {
 	PROP_STRING_PARM(n, 0);
-	bag.DefaultMove = n;
+	info->ActorInfo()->DefaultMove = n;
 }
 
 DEFINE_PROPERTY(moveflags, I, DukeActor)
 {
 	PROP_INT_PARM(n, 0);
-	bag.moveflags = n;
+	info->ActorInfo()->DefaultMoveflags = n;
 }
 
 CCMD(changewalltexture)