Revent some changes back to netbsd-cvs.

They are not necessary since we are compiling with NOGCCERROR=1 now,
and will most likely continue doing do until the problems are fixed.
note the netbsd-cvs branch