This fixes #7803.  It now properly does the sensors.