Revert "0.8.4 bug fixed"

This reverts commit 4e6df390b147fe24a9e6be0d7912cac5bd2584a0.
0.8.4