Get rid of silly generics stuff, thanks @fredreichbier!