diff --git a/Content.Shared/GameObjects/Verb.cs b/Content.Shared/GameObjects/Verb.cs
index 4fd3fe288b..0f929a1dce 100644
--- a/Content.Shared/GameObjects/Verb.cs
+++ b/Content.Shared/GameObjects/Verb.cs
@@ -114,7 +114,7 @@ namespace Content.Shared.GameObjects
         // This works for now though.
         public static IEnumerable<(IComponent, Verb)> GetVerbs(IEntity entity)
         {
-            foreach (var component in entity.GetComponentInstances())
+            foreach (var component in entity.GetAllComponents())
             {
                 var type = component.GetType();
                 foreach (var nestedType in type.GetNestedTypes(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static))
diff --git a/RobustToolbox b/RobustToolbox
index daa13de9ed..896758e176 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit daa13de9edd84a0ac36c96374e6f7181a693a09f
+Subproject commit 896758e176c909cab57c7b69f4f14927f36ffde5