nicki: partly revert "encryption fix"
nicki: Fix data fail to unmount when encrypt device