Revert "More torch goods"

This reverts commit b29d9062fce27808b247d0db29697bcad10e7b01.