This reverts commit d89616fda8 which introduced some build failures which need to be resolved before this can be merged. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #633
d89616fda8