Reverting changes 5889 through 5892 in tools and trunk,
due to build breakage

svn merge -r5892:5888 .



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5898 8db76d5a-ed1c-0410-87a9-c151d255dfc7