Harald Geyer: back out fork/vfork workaround and handle the issue directly