diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
index 80cba3ca02..edddabf146 100644
--- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs
+++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
@@ -33,7 +33,7 @@ namespace Content.Benchmarks
             // Initialize component manager.
             IoCManager.InitThread();
 
-            IoCManager.Register<IComponentManager, ComponentManager>();
+            IoCManager.Register<IComponentManager, EntityManager>();
             IoCManager.Register<IRuntimeLog, RuntimeLog>();
             IoCManager.Register<ILogManager, LogManager>();
             IoCManager.Register<IDynamicTypeFactory, DynamicTypeFactory>();
diff --git a/RobustToolbox b/RobustToolbox
index 52ad027854..c7461221b9 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 52ad02785455b16286b34ea8a8e9fa1ba8e81892
+Subproject commit c7461221b965c78c47f956f2e6af1f52d873ebf3