Revert diamond generics