Re-apply r5787. $ svn diff -c5787 | patch -p0 && svn commit user git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5810 8db76d5a-ed1c-0410-87a9-c151d255dfc7