diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
index abdba8c53b..0507b58b5e 100644
--- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs
+++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
@@ -63,9 +63,7 @@ namespace Content.Benchmarks
             // Initialize N entities with one component.
             for (var i = 0; i < N; i++)
             {
-                var entity = new Entity();
-                entity.SetManagers(entityManager);
-                entity.SetUid(new EntityUid(i + 1));
+                var entity = new Entity(entityManager, new EntityUid(i + 1));
                 _entities.Add(entity);
 
                 _componentManager.AddComponent<DummyComponent>(entity);
diff --git a/RobustToolbox b/RobustToolbox
index eb3a815d48..583b7ebf38 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit eb3a815d48e91308c72c218996a0fa2da14a4267
+Subproject commit 583b7ebf3818c090de1db1927c27163796910350