Sync. up with 3809 Recent libc change breaks... (ncp3 brand too)