Revert "More torch goods"

This reverts commit 55a25ba57e820329b5c37f8a647fab819e27e98e.
Revert "Catch Torch Service up with CM"

This reverts commit 2858738fa22252778391145d746495c7ca21362d.