backout 1644/1645/1646/1647/1708: Breaks 'zfs snapshot', boot environments
backout 1644/1645/1646/1647/1708: Breaks 'zfs snapshot', boot environments

jpeach/zfsd,jpeach/zfsd,jpeach/zfsd,jpeach/zfsd,jpeach/zfsd