Revert "Fix product_device"