--- ./daemon.c_orig	2025-10-27 05:46:34.408134556 -0500
+++ ./daemon.c	2025-10-27 06:15:41.938117123 -0500
@@ -917,6 +917,7 @@
 	/*
 	 * Otherwise empty handler because systemcalls should get interrupted
 	 * upon signal receipt.
+	 * AIX does NOT like, sometimes (t5570-git-daemon test 4), to rearm it. So: No!
 	 */
 }
 
@@ -1123,9 +1124,11 @@
 		pfd[i].events = POLLIN;
 	}
 
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = SA_NOCLDSTOP;
+	/* AIX does NOT like, sometimes (t5570-git-daemon test 4), to rearm the SIGCHLD handler */
+	bzero(&sa, sizeof(sa));
 	sa.sa_handler = child_handler;
+	sa.sa_flags = NULL;
+	sigemptyset(&sa.sa_mask);
 	sigaction(SIGCHLD, &sa, NULL);
 
 	for (;;) {