Rollback changes to support GWT 2.7.0