Fix?  One ugly hack is replaced by a different ugly hack.
Signed-off-by: NTony Luck <tony.luck@intel.com>