--- a/ipc/ipdl/test/cxx/PTestActorPunning.ipdl
+++ b/ipc/ipdl/test/cxx/PTestActorPunning.ipdl
@@ -16,24 +16,25 @@ child:
     async Start();
 
 parent:
     async PTestActorPunningPunned();
     async PTestActorPunningSub();
     async Pun(PTestActorPunningSub a, Bad bad);
     async __delete__();
 
-
+/*
 state PING:
     send Start goto CONSTRUCTING;
 
 state CONSTRUCTING:
     recv PTestActorPunningPunned goto CONSTRUCTING;
     recv PTestActorPunningSub goto CONSTRUCTING;
     recv Pun goto DEAD;
     // We never make it past this transition, --> error.
 
 state DEAD:
     recv __delete__;
+*/
 };
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
+++ b/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
@@ -10,17 +10,19 @@ protocol PTestBridgeMain {
     child opens PTestBridgeMainSub;
 
 child:
     async Start();
 
 parent:
     async __delete__();
 
+/*
 state START:
     send Start goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestBridgeMainSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestBridgeMainSub.ipdl
@@ -14,20 +14,22 @@ child:
     intr HiRpc();
 
 parent:
     async Hello();
     sync HelloSync();
     intr HelloRpc();
     async __delete__();
 
+/*
 state START:       recv Hello goto HI;
 state HI:          send Hi goto HELLO_SYNC;
 state HELLO_SYNC:  recv HelloSync goto HELLO_RPC;
 state HELLO_RPC:   answer HelloRpc goto HI_RPC;
 state HI_RPC:      call HiRpc goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestBridgeSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestBridgeSub.ipdl
@@ -7,19 +7,21 @@ namespace _ipdltest {
 protocol PTestBridgeSub {
 child:
     async Ping();
 
 parent:
     async BridgeEm();
     async __delete__();
 
+/*
 state START:
     send Ping goto BRIDGEEM;
 state BRIDGEEM:
     recv BridgeEm goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestCrashCleanup.ipdl
+++ b/ipc/ipdl/test/cxx/PTestCrashCleanup.ipdl
@@ -7,16 +7,18 @@ namespace mozilla {
 namespace _ipdltest {
 
 // NB: needs to be RPC so that the parent blocks on the child's crash.
 intr protocol PTestCrashCleanup {
 child:
     intr DIEDIEDIE();
     async __delete__();
 
+/*
 state ALIVE:
     call DIEDIEDIE goto CRASH;
 state CRASH:
     send __delete__;
+*/
 };
 
 }
 }

--- a/ipc/ipdl/test/cxx/PTestDataStructures.ipdl
+++ b/ipc/ipdl/test/cxx/PTestDataStructures.ipdl
@@ -96,16 +96,17 @@ parent:
 
     // test that the ParamTraits<nsTArray>::Read() workaround for
     // nsTArray's incorrect memmove() semantics works properly
     // (nsIntRegion isn't memmove()able)
     sync Test18(nsIntRegion[] ops);
 
     sync Dummy(ShmemUnion su) returns (ShmemUnion rsu);
 
+/*
 state CONSTRUCTING:
     send PTestDataStructuresSub goto CONSTRUCTING;
     send Start goto TEST1;
 state TEST1:   recv Test1 goto TEST2;
 state TEST2:   recv Test2 goto TEST3;
 state TEST3:   recv Test3 goto TEST4;
 state TEST4:   recv Test4 goto TEST5;
 state TEST5:   recv Test5 goto TEST6;
@@ -120,13 +121,14 @@ state TEST13:  recv Test13 goto TEST14;
 state TEST14:  recv Test14 goto TEST15;
 state TEST15:  recv Test15 goto TEST16;
 state TEST16:  recv Test16 goto TEST17;
 state TEST17:  recv Test17 goto TEST18;
 state TEST18:  recv Test18 goto DEAD;
 
 state DEAD:
     recv __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla
 

--- a/ipc/ipdl/test/cxx/PTestDesc.ipdl
+++ b/ipc/ipdl/test/cxx/PTestDesc.ipdl
@@ -11,21 +11,22 @@ child:
 
     async Test(PTestDescSubsub a);
 
     async __delete__();
 
 parent:
     async Ok(PTestDescSubsub a);
 
-
+/*
 state CONSTRUCT:
     call PTestDescSub goto TEST;
 state TEST:
     send Test goto ACK;
 state ACK:
     recv Ok goto DEAD;
 state DEAD:
     send __delete__;
+*/
 };
 
 }
 }

--- a/ipc/ipdl/test/cxx/PTestEndpointOpensOpened.ipdl
+++ b/ipc/ipdl/test/cxx/PTestEndpointOpensOpened.ipdl
@@ -11,20 +11,22 @@ child:
     intr HiRpc();
 
 parent:
     async Hello();
     sync HelloSync();
     intr HelloRpc();
     async __delete__();
 
+/*
 state START:       recv Hello goto HI;
 state HI:          send Hi goto HELLO_SYNC;
 state HELLO_SYNC:  recv HelloSync goto HELLO_RPC;
 state HELLO_RPC:   answer HelloRpc goto HI_RPC;
 state HI_RPC:      call HiRpc goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest2

--- a/ipc/ipdl/test/cxx/PTestFailedCtor.ipdl
+++ b/ipc/ipdl/test/cxx/PTestFailedCtor.ipdl
@@ -4,16 +4,18 @@ namespace mozilla {
 namespace _ipdltest {
 
 intr protocol PTestFailedCtor {
     manages PTestFailedCtorSub; 
 child:
     intr PTestFailedCtorSub();
     async __delete__();
 
+/*
 state CONSTRUCT:
     call PTestFailedCtorSub goto DEAD;
 state DEAD:
     send __delete__;
+*/
 };
 
 }
 }

--- a/ipc/ipdl/test/cxx/PTestJSON.ipdl
+++ b/ipc/ipdl/test/cxx/PTestJSON.ipdl
@@ -36,19 +36,21 @@ child:
     async Start();
 
 parent:
     async PTestHandle();
     sync Test(JSONVariant i)
         returns (JSONVariant o);
     async __delete__();
 
+/*
 state START:
     send Start goto TEST;
 
 state TEST:
     recv PTestHandle goto TEST;
     recv Test goto TEST;
     recv __delete__;
+*/
 };
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestMultiMgrs.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrs.ipdl
@@ -12,23 +12,25 @@ parent:
     async OK();
 
 child:
     async PTestMultiMgrsLeft();
     async PTestMultiMgrsRight();
     async Check();
     async __delete__();
 
+/*
 state START:
     send PTestMultiMgrsLeft goto CONSTRUCT_RIGHT;
 state CONSTRUCT_RIGHT:
     send PTestMultiMgrsRight goto CHILD_CHECK;
 state CHILD_CHECK:
     send Check goto CHILD_ACK;
 state CHILD_ACK:
     recv OK goto DONE;
 
 state DONE:
     send __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestMultiMgrsBottom.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsBottom.ipdl
@@ -5,14 +5,16 @@ namespace mozilla {
 namespace _ipdltest {
 
 protocol PTestMultiMgrsBottom {
     manager PTestMultiMgrsLeft or PTestMultiMgrsRight;
 
 child:
     async __delete__();
 
+/*
 state DOA:
     send __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestMultiMgrsLeft.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsLeft.ipdl
@@ -8,17 +8,19 @@ protocol PTestMultiMgrsLeft {
     manager PTestMultiMgrs;
 
     manages PTestMultiMgrsBottom;
 
 child:
     async PTestMultiMgrsBottom();
     async __delete__();
 
+/*
 state START:
     send PTestMultiMgrsBottom goto DONE;
 
 state DONE:
     send __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestMultiMgrsRight.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsRight.ipdl
@@ -8,17 +8,19 @@ protocol PTestMultiMgrsRight {
     manager PTestMultiMgrs;
 
     manages PTestMultiMgrsBottom;
 
 child:
     async PTestMultiMgrsBottom();
     async __delete__();
 
+/*
 state START:
     send PTestMultiMgrsBottom goto DONE;
 
 state DONE:
     send __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestOpens.ipdl
+++ b/ipc/ipdl/test/cxx/PTestOpens.ipdl
@@ -9,17 +9,19 @@ protocol PTestOpens {
     child opens PTestOpensOpened;
 
 child:
     async Start();
 
 parent:
     async __delete__();
 
+/*
 state START:
     send Start goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestOpensOpened.ipdl
+++ b/ipc/ipdl/test/cxx/PTestOpensOpened.ipdl
@@ -9,20 +9,22 @@ child:
     intr HiRpc();
 
 parent:
     async Hello();
     sync HelloSync();
     intr HelloRpc();
     async __delete__();
 
+/*
 state START:       recv Hello goto HI;
 state HI:          send Hi goto HELLO_SYNC;
 state HELLO_SYNC:  recv HelloSync goto HELLO_RPC;
 state HELLO_RPC:   answer HelloRpc goto HI_RPC;
 state HI_RPC:      call HiRpc goto DEAD;
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest2

--- a/ipc/ipdl/test/cxx/PTestRacyInterruptReplies.ipdl
+++ b/ipc/ipdl/test/cxx/PTestRacyInterruptReplies.ipdl
@@ -7,16 +7,17 @@ child:
     async _A();
     async ChildTest();
     async __delete__();
 
 parent:
     intr _R() returns (int replyNum);
     async A_();
 
+/*
 state PARENT_START:
     call R_ goto PARENT_S1;
 
 state PARENT_S1:
     recv A_ goto PARENT_S2;
 
 state PARENT_S2:
     call R_ goto CHILD_TEST;
@@ -30,12 +31,13 @@ state CHILD_START:
 state CHILD_S1:
     send _A goto CHILD_S2;
 
 state CHILD_S2:
     answer _R goto DYING;
 
 state DYING:
     send __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestSanity.ipdl
+++ b/ipc/ipdl/test/cxx/PTestSanity.ipdl
@@ -7,22 +7,23 @@ protocol PTestSanity {
 
 child:
     async Ping(int zero, float zeroPtFive, int8_t dummy);
     async __delete__();
 
 parent:
     async Pong(int one, float zeroPtTwoFive, uint8_t dummy);
 
-
+/*
 state PING:
     send Ping goto PONG;
 
 state PONG:
     recv Pong goto DEAD;
 
 state DEAD:
     send __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestSelfManage.ipdl
+++ b/ipc/ipdl/test/cxx/PTestSelfManage.ipdl
@@ -7,16 +7,18 @@ namespace _ipdltest {
 protocol PTestSelfManage {
     manager PTestSelfManageRoot or PTestSelfManage;
     manages PTestSelfManage;
 
 child:
     async PTestSelfManage();
     async __delete__();
 
+/*
 state LIVE:
     send PTestSelfManage goto LIVE;
     send __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestSelfManageRoot.ipdl
+++ b/ipc/ipdl/test/cxx/PTestSelfManageRoot.ipdl
@@ -6,18 +6,20 @@ namespace _ipdltest {
 
 protocol PTestSelfManageRoot {
     manages PTestSelfManage;
 
 child:
     async PTestSelfManage();
     async __delete__();
 
+/*
 state LIVE:
     send PTestSelfManage goto DEAD;
 
 state DEAD:
     send __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestShmem.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShmem.ipdl
@@ -4,19 +4,20 @@ namespace _ipdltest {
 protocol PTestShmem {
 child:
     async Give(Shmem mem, Shmem unsafe, size_t expectedSize);
 
 parent:
     async Take(Shmem mem, Shmem unsafe, size_t expectedSize);
     async __delete__();
 
-
+/*
 state GIVING:
     send Give goto TAKING;
 
 state TAKING:
     recv Take goto TAKING;
     recv __delete__;
+*/
 };
 
 }
 }

--- a/ipc/ipdl/test/cxx/PTestShutdown.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdown.ipdl
@@ -16,22 +16,23 @@ parent:
     async PTestShutdownSub(bool expectCrash);
 
     // Used to synchronize between parent and child, to avoid races
     // around flushing socket write queues
     sync Sync();
 
     async __delete__();
 
-
+/*
 state START:
     send Start goto TESTING;
 
 state TESTING:
     recv PTestShutdownSub goto TESTING;
     recv Sync goto DYING;
 
 state DYING:
     recv __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestShutdownSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdownSub.ipdl
@@ -10,21 +10,23 @@ intr protocol PTestShutdownSub {
 
 both:
     intr StackFrame();
 
 parent:
     async PTestShutdownSubsub(bool expectParentDeleted);
     sync __delete__();
 
+/*
 state CREATING:
     recv PTestShutdownSubsub goto CREATING;
     answer StackFrame goto DUMMYFRAME;
 
 state DUMMYFRAME:
     call StackFrame goto DEAD;
 
 state DEAD:
     recv __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestShutdownSubsub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdownSubsub.ipdl
@@ -4,14 +4,16 @@ namespace mozilla {
 namespace _ipdltest {
 
 sync protocol PTestShutdownSubsub {
     manager PTestShutdownSub;
 
 parent:
     sync __delete__();
 
+/*
 state LIVE:
     recv __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla

--- a/ipc/ipdl/test/cxx/PTestStackHooks.ipdl
+++ b/ipc/ipdl/test/cxx/PTestStackHooks.ipdl
@@ -15,17 +15,17 @@ parent:
     intr Rpc();
 
 both:
     intr StackFrame();
 
 parent:
     async __delete__();
 
-
+/*
 state START:
     send Start goto TEST1;
 
 state TEST1:
     recv Async goto TEST2;
 
 state TEST2:
     recv Sync goto TEST3;
@@ -44,13 +44,14 @@ state TEST5:
     answer StackFrame goto TEST5_2;
 state TEST5_2:
     call StackFrame goto TEST5_3;
 state TEST5_3:
     recv Sync goto DEAD;
 
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestSyncError.ipdl
+++ b/ipc/ipdl/test/cxx/PTestSyncError.ipdl
@@ -7,22 +7,23 @@ sync protocol PTestSyncError {
 
 child:
     async Start();
 
 parent:
     sync Error();
     async __delete__();
 
-
+/*
 state START:
     send Start goto SYNC_ERROR;
 
 state SYNC_ERROR:
     recv Error goto DEAD;
 
 state DEAD:
     recv __delete__;
+*/
 };
 
 
 } // namespace mozilla
 } // namespace _ipdltest

--- a/ipc/ipdl/test/cxx/PTestSyncWakeup.ipdl
+++ b/ipc/ipdl/test/cxx/PTestSyncWakeup.ipdl
@@ -10,17 +10,17 @@ child:
     async Note1();
     async Note2();
 
 parent:
     sync Sync1();
     sync Sync2();
     async __delete__();
 
-
+/*
 state START:
     send Start goto TEST1;
 
 state TEST1:
     recv Sync1 goto TEST1_P2;
 state TEST1_P2:
     send Note1 goto TEST2;
 
@@ -30,12 +30,13 @@ state TEST2_P2:
     call StackFrame goto TEST2_P3;
 state TEST2_P3:
     recv Sync2 goto TEST2_P4;
 state TEST2_P4:
     send Note2 goto DONE;
 
 state DONE:
     recv __delete__;
+*/
 };
 
 } // namespace _ipdltest
 } // namespace mozilla