Revert r275136, it was not approved, it was sloppy, if a feature
like this is needed please resubmit for Intel's approval.