diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 6306e719..9c639ed9 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -132,7 +132,7 @@ namespace TShockAPI
 				ConfigFile.ConfigRead += OnConfigRead;
 				FileTools.SetupConfig();
 
-				Main.ServerSideCharacter = Config.ServerSideCharacter; //FYI, This cannot be disabled once flipped.
+				Main.ServerSideCharacter = Config.ServerSideCharacter;
 
 				DateTime now = DateTime.Now;
 				string logFilename;
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index 92376508..c49eaf5e 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit 9237650872605044f07886ba43c887949ff283e1
+Subproject commit c49eaf5e01f478ac6a87e5c73be3369dbe7d7f94