diff --git a/hphp/runtime/vm/event_hook.cpp b/hphp/runtime/vm/event_hook.cpp
index 5035d178c..4f6fd5105 100644
--- a/hphp/runtime/vm/event_hook.cpp
+++ b/hphp/runtime/vm/event_hook.cpp
@@ -144,7 +144,8 @@ void EventHook::onFunctionExit(const ActRec* ar) {
   // exception).
   if (ThreadInfo::s_threadInfo->m_pendingException == nullptr) {
     RunUserProfiler(ar, ProfileExit);
-    CheckSurprise();
+    // XXX Disabled until t2329497 is fixed:
+    // CheckSurprise();
   }
 }
 
diff --git a/hphp/test/zend/good/ext-pcntl/signal_closure_handler.php b/hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php
similarity index 100%
rename from hphp/test/zend/good/ext-pcntl/signal_closure_handler.php
rename to hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php
diff --git a/hphp/test/zend/good/ext-pcntl/signal_closure_handler.php.expectf b/hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext-pcntl/signal_closure_handler.php.expectf
rename to hphp/test/zend/bad/ext-pcntl/signal_closure_handler.php.expectf