diff --git a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs b/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
index 8ada03d7c6..d2136888bb 100644
--- a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
+++ b/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
@@ -29,13 +29,13 @@ namespace Content.Shared.Network.NetMessages
         {
             var serializer = IoCManager.Resolve<IRobustSerializer>();
             var length = buffer.ReadVariableInt32();
-            using (var stream = buffer.ReadAsStream(length))
+            using (var stream = buffer.ReadAlignedMemory(length))
             {
                 serializer.DeserializeDirect(stream, out Preferences);
             }
 
             length = buffer.ReadVariableInt32();
-            using (var stream = buffer.ReadAsStream(length))
+            using (var stream = buffer.ReadAlignedMemory(length))
             {
                 serializer.DeserializeDirect(stream, out Settings);
             }
diff --git a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs b/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
index 430b18324b..9e32bf379e 100644
--- a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
+++ b/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
@@ -30,7 +30,7 @@ namespace Content.Shared.Network.NetMessages
             Slot = buffer.ReadInt32();
             var serializer = IoCManager.Resolve<IRobustSerializer>();
             var length = buffer.ReadVariableInt32();
-            using var stream = buffer.ReadAsStream(length);
+            using var stream = buffer.ReadAlignedMemory(length);
             Profile = serializer.Deserialize<ICharacterProfile>(stream);
         }
 
diff --git a/Content.Shared/SharedGameTicker.cs b/Content.Shared/SharedGameTicker.cs
index d4bb2bc161..9d49e30c21 100644
--- a/Content.Shared/SharedGameTicker.cs
+++ b/Content.Shared/SharedGameTicker.cs
@@ -204,7 +204,7 @@ namespace Content.Shared
                     var serializer = IoCManager.Resolve<IRobustSerializer>();
                     var byteLength = buffer.ReadVariableInt32();
                     NetUserId userId;
-                    using (var stream = buffer.ReadAsStream(byteLength))
+                    using (var stream = buffer.ReadAlignedMemory(byteLength))
                     {
                         serializer.DeserializeDirect(stream, out userId);
                     }
diff --git a/Content.Shared/StationEvents/SharedStationEvent.cs b/Content.Shared/StationEvents/SharedStationEvent.cs
index 837e8980ab..82f41a4614 100644
--- a/Content.Shared/StationEvents/SharedStationEvent.cs
+++ b/Content.Shared/StationEvents/SharedStationEvent.cs
@@ -24,7 +24,7 @@ namespace Content.Shared.StationEvents
             {
                 var serializer = IoCManager.Resolve<IRobustSerializer>();
                 var length = buffer.ReadVariableInt32();
-                using var stream = buffer.ReadAsStream(length);
+                using var stream = buffer.ReadAlignedMemory(length);
                 Events = serializer.Deserialize<List<string>>(stream);
             }
 
diff --git a/RobustToolbox b/RobustToolbox
index 6b769d814e..cabb9859ec 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 6b769d814eb3183404c3886b6f84adb0571a3d4e
+Subproject commit cabb9859eca718a9842c9ed9332f09b47fb5d967
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
index 99f3ac6702..13055aecaf 100644
--- a/SpaceStation14.sln
+++ b/SpaceStation14.sln
@@ -69,8 +69,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{DDD55F86
 		RobustToolbox\Tools\download_natives.py = RobustToolbox\Tools\download_natives.py
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lidgren.Network.UnitTests", "RobustToolbox\Lidgren.Network.UnitTests\Lidgren.Network.UnitTests.csproj", "{682E3140-4F27-4ECB-8029-D436319DDC48}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Physics", "RobustToolbox\Robust.Physics\Robust.Physics.csproj", "{3BC34700-882F-426B-82BB-56D5708B5E0D}"
@@ -143,10 +141,6 @@ Global
 		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{682E3140-4F27-4ECB-8029-D436319DDC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{682E3140-4F27-4ECB-8029-D436319DDC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{682E3140-4F27-4ECB-8029-D436319DDC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{682E3140-4F27-4ECB-8029-D436319DDC48}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -171,7 +165,6 @@ Global
 		{50404922-9637-4394-BF59-165D0850ADC8} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{DDD55F86-0406-42E5-8443-93EDC6BB2D75} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{682E3140-4F27-4ECB-8029-D436319DDC48} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{3BC34700-882F-426B-82BB-56D5708B5E0D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 	EndGlobalSection