Revert "Squash Thermal Framework Support"

This reverts commit 84ab6e7c2a65877161d44acccc0a2be99c166cc9.