GWT-451: fix build for changes in GWT2