Revert 824fd7b..651e2e1

This rolls back to commit 824fd7b0bc86e38dac9a6f5c7b438c7a62578cc5.
1.48

整合