Backport a fix to ZFS reverting via life-preserver