diff --git a/Runtime/World/CScriptActorKeyframe.cpp b/Runtime/World/CScriptActorKeyframe.cpp
index e8d9d0507..4f8c44130 100644
--- a/Runtime/World/CScriptActorKeyframe.cpp
+++ b/Runtime/World/CScriptActorKeyframe.cpp
@@ -95,6 +95,9 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
                     animData->EnableLooping(false);
             }
         }
+        // TODO: Re-enable this
+
+#if 0
         else if (TCastToPtr<CPatterned> ai = ent)
         {
             CAnimData* animData = ai->ModelData()->AnimationData();
@@ -108,6 +111,7 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
                 ai->BodyController()->GetCommandMgr().DeliverCmd(CBodyStateCmd(EBodyStateCmd::ExitState));
             }
         }
+#endif
     }
 
     CEntity::Think(dt, mgr);
@@ -142,6 +146,8 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr)
             }
         }
     }
+    // TODO: Re-enable this
+#if 0
     else if (TCastToPtr<CPatterned> ai = ent)
     {
         CAnimData* animData = ai->ModelData()->AnimationData();
@@ -155,5 +161,6 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr)
                 CBCScriptedCmd(x34_animationId, x44_24_looping, x44_27_timedLoop, x38_initialLifetime));
         }
     }
+#endif
 }
 }
diff --git a/amuse b/amuse
index 1fefba66e..e3c936648 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 1fefba66e7fc96cb6fc1b1b014c365da2e0b7a43
+Subproject commit e3c936648b40345997445326b95cfdda50dc32c8
diff --git a/hecl b/hecl
index c26f24fb9..c8f9d4cc0 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit c26f24fb90da308ef6428b3198522d13569df50d
+Subproject commit c8f9d4cc050dc5dc0e4ae78beee80814b352bd8c