Re-enable code dependant on reified generics