diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp
index 5e0b1ebbcc..8d4011def7 100644
--- a/stepmania/src/MessageManager.cpp
+++ b/stepmania/src/MessageManager.cpp
@@ -50,8 +50,6 @@ static const char *MessageNames[] = {
 	"MenuRightP1",
 	"MenuRightP2",
 	"MenuSelectionChanged",
-	"MadeChoiceP1",
-	"MadeChoiceP2",
 	"CoinInserted",
 	"SideJoinedP1",
 	"SideJoinedP2",
diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h
index 537f49d000..12efceb3b7 100644
--- a/stepmania/src/MessageManager.h
+++ b/stepmania/src/MessageManager.h
@@ -45,8 +45,6 @@ enum Message
 	Message_MenuRightP1,
 	Message_MenuRightP2,
 	Message_MenuSelectionChanged,
-	Message_MadeChoiceP1,
-	Message_MadeChoiceP2,
 	Message_CoinInserted,
 	Message_SideJoinedP1,
 	Message_SideJoinedP2,
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 96c2581df8..0c141d327f 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -679,7 +679,7 @@ float ScreenSelectMaster::DoMenuStart( PlayerNumber pn )
 
 	m_bChosen[pn] = true;
 
-	MESSAGEMAN->Broadcast( (Message)(Message_MadeChoiceP1+pn) );
+	this->PlayCommand( "MadeChoice"+PlayerNumberToString(pn) );
 
 	bool bIsFirstToChoose = bAnyChosen;