Revert "20140501_by_ShawnWu v.4.0.20140501"

This reverts commit ee186d13c4578cfe660120ba0dc8077e9e44b580.