Torch: switch back to upstream version

Change-Id: I574e0c1b3b0f8527829c65ee6d5e0647493af111