Rolling back r9549 due to downstream build breaks. git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9552 8db76d5a-ed1c-0410-87a9-c151d255dfc7