reverting changes to itype.h