Revert "try matching by compatible id vs by hardware id"

This reverts commit e0d7225ab93770c76a24a3229162febee25e0743.