remove type_info hacks; 1.21.8