Revert "prep for the new thermal drivers"

This reverts commit cfea35ee864c340e38eef0b16ce462f627e7306d.