Revert "some modification"

This reverts commit e6a7c00a40a949750295e70701d3fe7800a79a3e.