Revert "Commit from xiaofan"

This reverts commit ea5e61f4d626b91c11f8abdfc7dfe2c7ec214152.