Reverted Peter's change, in order to break Windows compliation, but restore HLT compi...