Temp revert of heat commit

Revert of https://review.openstack.org/#/c/92033/ to unblock ci while
heat is fixed.

Change-Id: I5a53f0de13cf01bc0ed7145c386d90356ae52bbf