Revert r1296868, as it is wrong/unnecessary.  See its thread for details.
Revert r1296868, as it is wrong/unnecessary.  See its thread for details.

Found by: philip

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

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