Get back to one factory to avoid FreeBSD kills

(Also, bootstrap is now fast.)