reverting REV: 991591, adding generics
2 files changed