different fix for extra make-record-type-descriptor index entry original commit: 6c4e0a5fd7c5d99690935ad04239406188977425
original commit: 23833c7d0194248143af425dd22e34a760e81505
original commit: 47a210c15c63ba9677852269447bd2f2598b51fe