Revert r1297223 and r1297231.
Revert r1297223 and r1297231.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1297239 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion