Fix regression caused by recently added syscall restart code