Revert "Merge pull request #8081 from robx/fix-terminate-race"

This reverts commit fa66306, reversing
changes made to 32259a1.

Author: jneira

cabal-testsuite/PackageTests/NewBuild/CmdRun/Terminate/Main.hs

@@ -4,11 +4,13 @@ import qualified System.Posix.Signals as Signal
 import System.Exit (exitFailure)
 
 main = do
+  writeFile "exe.run" "up and running"
   mainThreadId <- myThreadId
   Signal.installHandler Signal.sigTERM (Signal.Catch $ killThread mainThreadId) Nothing
-  do
-    putStrLn "about to sleep"
-    writeFile "exe.run" "up and running"
-    threadDelay 10000000 -- 10s
-    putStrLn "done sleeping"
-  `finally` putStrLn "exiting"
+  sleep
+    `finally` putStrLn "exiting"
+  where
+    sleep = do
+      putStrLn "about to sleep"
+      threadDelay 10000000 -- 10s
+      putStrLn "done sleeping"