Rollback some changes for GWT 2.7.0 compatibility.