Revert "by wang 1-13 2013"

This reverts commit af859ee1eabb5b2e165eb53eb53755b21a7ed35f.