This wasn't failing, but this now uses a full blown device class.