Revert "Fix for HoTs, sorry.."

This reverts commit f247f415eaaf22de8dc34e17fc1835910c6e9636.
HoTFix