This reverts commit d135245791. Since feature flags have now been merged we can apply the real upstream fix from Illumos. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #997
d135245791