Revert "去掉"

This reverts commit 2d63d29bb2b8a2ab4cccbc01593c4efbcb9099e3.
Revert "Revert "兼容""

This reverts commit c0dd3afeb6cd32693378f4747101e343619c7249.