Revert "Moving heat-choice in K."

This reverts commit 091c9efa756273df3bbdfd5004b46319b1aeaa3f.