Revert "edit by sun on 20140916"

This reverts commit cedb495b25c069b21e5350b587da047d7324fed2.