Taking a 2 year old intel fix from the trunk. Merging would fix several other things.