Bring Torch back to device files