Revert "This change addresses 4 bugs in ZFS exposed by Richard Kojedzinszky's"

This reverts commit c9403df2b4f9a400590d9fbb3dd5582beb6c1421.

Requested by:	jpaetzel