Revert 248634 and 248643 (e.g., restoring 248625 and 248639).

Build verified by: Glen Barber (gjb@)
Fix kernel build with options ZFS after r24571 (libzfs_core).

Submitted by:	Bjoern A. Zeeb <bz@FreeBSD.org>