Revert "Get rid of the whole modelid stuff, no supported device uses this crap"

This reverts commit 6f1fba20ef8d329423410d15731b4bd7b3ab03d3.