Added the -nd and -nd-thread back into the build processes.