Revert "Torch fix, for future"