Reverted commit with generics