Revert "Li's code 20131213"

This reverts commit 6838f7d381642504c9318ba87b97e3945668d96c.