dycoon's modification.

This reverts commit a9d19c859a979bd364717f5118ebcc6af82866cb.