Revert "Second commit from xueliang"

This reverts commit b67ea510993962e1c963132e9f72bc14f90af91e.