This reverts commit fa81511b in
preparation of merging in the proper fix (espfix64).
Signed-off-by: NH. Peter Anvin <hpa@zytor.com>