Revert "pull in heat bug fix."