More work on #8327.  I realized that the device should have this function also.