diff --git a/init/main.c b/init/main.c
index d7211fa..da57698 100644
--- a/init/main.c
+++ b/init/main.c
@@ -748,9 +748,6 @@
 	system_state = SYSTEM_RUNNING;
 	numa_default_policy();
 
-
-	current->signal->flags |= SIGNAL_UNKILLABLE;
-
 	if (ramdisk_execute_command) {
 		run_init_process(ramdisk_execute_command);
 		printk(KERN_WARNING "Failed to execute %s\n",
diff --git a/kernel/fork.c b/kernel/fork.c
index 0276c30..59e3756 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -960,8 +960,6 @@
 	atomic_set(&sig->live, 1);
 	atomic_set(&sig->sigcnt, 1);
 	init_waitqueue_head(&sig->wait_chldexit);
-	if (clone_flags & CLONE_NEWPID)
-		sig->flags |= SIGNAL_UNKILLABLE;
 	sig->curr_target = tsk;
 	init_sigpending(&sig->shared_pending);
 	INIT_LIST_HEAD(&sig->posix_timers);
@@ -1343,8 +1341,18 @@
 		tracehook_finish_clone(p, clone_flags, trace);
 
 		if (thread_group_leader(p)) {
-			if (is_child_reaper(pid))
+			if (is_child_reaper(pid)) {
+				/*
+				 * Tell the world that we're going to be the grim
+				 * reaper of innocent orphaned children.
+				 *
+				 * We don't want people to have to make incorrect
+				 * assumptions about where in the task array this
+				 * can be found.
+				 */
 				p->nsproxy->pid_ns->child_reaper = p;
+				p->signal->flags |= SIGNAL_UNKILLABLE;
+			}
 
 			p->signal->leader_pid = pid;
 			p->signal->tty = tty_kref_get(current->signal->tty);