zfs problem

I rebuilt and installed -current as of last night (10:30PM
PST or so).  Now both zfs & zpool croak out the following
message as they die:

    link_elf: symbol sysctl_handle_quad undefined
    internal error: failed to initialized zfs library

So I am trying to recover from losing /usr.  Trying to run
older zfs/zpool doesn't help.  Trying to compile them
statically on another system doesn't work either (libgeom and
libzfs have undefined references).  I can't even locate where
sysct_handle_quad is defined!

I suppose I can rebuild everything but it would be nice
to know what broke and if there is a work around.

Looks like zfs/zpool need to be added to /rescue.