restore multiple inventory classes for non-hardware fields, #24784, from #21442