m8: fix all teh torch!

Change-Id: Icdbe658e584532a12d2a4a039d65ae9cf74b6e3a