Add back missing TypeConverter that got removed in last commit