original commit from Eclipse