Ok... reverting r1098637. Even though it completes the test run, this doesn't look ok.
Ok... reverting r1098637. Even though it completes the test run, this doesn't look ok.


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion