restore select-hardware field behavior, from #21442