Revert "Merge branch 'CA-114341' into xs64bit"

This reverts commit f8b84e8f9f36a7e353a25fda5d82a61da1b3ecb0, reversing
changes made to 6ed0284e5516cdc03fe1e07de20c0d17ab6ff68c.

Signed-off-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>