Build-from-scratch build fix.