reverting c810f4a becouse it's a gwt limitation