This is a partial fix for bug #8003.  I still need to get the device upload setting a different action