Revert "Again original codes"

This reverts commit e84649d75a30fdc62012cae5956c88870ec577ac.