Finish botched roll-back of r8752 and r8762. This finished the roll-back start in r8804. Review by: chak@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8806 8db76d5a-ed1c-0410-87a9-c151d255dfc7