Revert "Merge CA-145685 into xs64bit"

This reverts commit e409963be9a44636fb2a4ade304bbb2d3e4056bc, reversing
changes made to b4fa67284dd6a14dde5982d1a5934e7ff816964e.

Signed-off-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>
Reviewed-by: Thanos Makatos <thanos.makatos@citrix.com>