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

(cherry picked from commit 7ed6fb9b)
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>