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

This reverts commit b1ea896f36e6c2c0bca8496fcb668a95411c09cb, reversing
changes made to 246b35670f68410c1f589c99bbddc69858f59032. Revert required
to fix BVT.