This reverts commit a5c8119eba. The commit (which was modified to remove encryption) was hitting ASSERT(dsl_pool_config_held(dmu_objset_pool(os))) in dmu_objset_upgrade() during automated testing. Signed-off-by: Tony Hutter <hutter2@llnl.gov>
a5c8119eba