Temporary reverting some changes

It will make same effect of reverting my change.