Revert "Some modification"

This reverts commit 810b5c61534c681d375de603a716ff2f9a6449b1.