Torch be gone!

Change-Id: I5e53d56f2beb13bb2b17701e37b1af349f714bf7