Unrolling screwup commits in r1417, r1419.

Review by: scottb (desk check)



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