--- Libc/Libc-1725.40.4/sys/fork.c
+++ Libc/Libc-825.26/sys/fork.c
@@ -23,48 +23,32 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <TargetConditionals.h>
-#include <stdbool.h>
-
-#include "_libc_init.h" // for libc_atfork_helper
 
 extern pid_t __fork(void);
-extern pid_t __vfork(void);
+extern void _cthread_fork_prepare();
+extern void _cthread_fork_parent();
+extern void _cthread_fork_child();
 
 static void (*_libSystem_atfork_prepare)(void) = 0;
 static void (*_libSystem_atfork_parent)(void) = 0;
 static void (*_libSystem_atfork_child)(void) = 0;
-static void (*_libSystem_atfork_prepare_v2)(unsigned int flags, ...) = 0;
-static void (*_libSystem_atfork_parent_v2)(unsigned int flags, ...) = 0;
-static void (*_libSystem_atfork_child_v2)(unsigned int flags, ...) = 0;
 
-__private_extern__
-void _libc_fork_init(const struct _libc_functions *funcs)
+__private_extern__ void _libc_fork_init(void (*prepare)(void), void (*parent)(void), void (*child)(void))
 {
-	if (funcs->version >= 2) {
-		_libSystem_atfork_prepare_v2 = funcs->atfork_prepare_v2;
-		_libSystem_atfork_parent_v2 = funcs->atfork_parent_v2;
-		_libSystem_atfork_child_v2 = funcs->atfork_child_v2;
-	} else {
-		_libSystem_atfork_prepare = funcs->atfork_prepare;
-		_libSystem_atfork_parent = funcs->atfork_parent;
-		_libSystem_atfork_child = funcs->atfork_child;
-	}
+	_libSystem_atfork_prepare = prepare;
+	_libSystem_atfork_parent = parent;
+	_libSystem_atfork_child = child;
 }
 
-static inline __attribute__((always_inline))
+/*
+ * fork stub
+ */
 pid_t
-_do_fork(bool libsystem_atfork_handlers_only)
+fork(void)
 {
 	int ret;
-
-	int flags = libsystem_atfork_handlers_only ? LIBSYSTEM_ATFORK_HANDLERS_ONLY_FLAG : 0;
-
-	if (_libSystem_atfork_prepare_v2) {
-		_libSystem_atfork_prepare_v2(flags);
-	} else {
-		_libSystem_atfork_prepare();
-	}
+	
+	_libSystem_atfork_prepare();
 	// Reader beware: this __fork() call is yet another wrapper around the actual syscall
 	// and lives inside libsyscall. The fork syscall needs some cuddling by asm before it's
 	// allowed to see the big wide C world.
@@ -72,46 +56,18 @@
 	if (-1 == ret)
 	{
 		// __fork already set errno for us
-		if (_libSystem_atfork_parent_v2) {
-			_libSystem_atfork_parent_v2(flags);
-		} else {
-			_libSystem_atfork_parent();
-		}
+		_libSystem_atfork_parent();
 		return ret;
 	}
-
+	
 	if (0 == ret)
 	{
 		// We're the child in this part.
-		if (_libSystem_atfork_child_v2) {
-			_libSystem_atfork_child_v2(flags);
-		} else {
-			_libSystem_atfork_child();
-		}
+		_libSystem_atfork_child();
 		return 0;
 	}
-
-	if (_libSystem_atfork_parent_v2) {
-		_libSystem_atfork_parent_v2(flags);
-	} else {
-		_libSystem_atfork_parent();
-	}
+	
+	_libSystem_atfork_parent();
 	return ret;
 }
 
-pid_t
-fork(void)
-{
-	return _do_fork(false);
-}
-
-pid_t
-vfork(void)
-{
-	// vfork() is now just fork().
-	// Skip the API pthread_atfork handlers, but do call our own
-	// Libsystem_atfork handlers. People are abusing vfork in ways where
-	// it matters, e.g. tcsh does all kinds of stuff after the vfork. Sigh.
-	return _do_fork(true);
-}
-