Revert "Temp revert of heat commit"

This reverts commit 0227e314da73b813662de673756b1b230b295b84.

This commit isn't the problem, it just unmasks the symptoms.

Change-Id: I80913559b13222de7cab10df157605bf82ef5fc3