Revert "prep for the new thermal drivers"

This reverts commit bc902b71996b1700dd28b4ad503b0f6be3a0d484.