fix force close when configuration change
Revert "fix force close when configuration change"

This reverts commit f335db59c27e06e88ffc1a45d92a960c54ded5b4.