undo some unnecessary (and possibly harmful) changes to method signatures