Revert partial, unfinished Sandy Bridge support, to be added again once fully implementd