Torch: remove hacks

Change-Id: I43ac242f42e86c5fd4ae2ae5e3b56ae62ae3e8eb