This fixes #7391.  It now recognizes the C and B versions of the hardware.