Revert "2012060030010 王丹"

This reverts commit c2eb5e153de60c812090392b39f415da3bf81f80.