Put back code that was needed, move gen_new into new_unique.
Put back code that was needed, move gen_new into new_unique.


git-svn-id: 193148810cf65385f3a195dbc9a8b504846da3a2@22113 ec53bebd-3082-4978-b11e-865c3cabbd6b

madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal,madscientist159/heimdal