JBDS-2801: Remove dependency on gwt feature