Same XenoArch computer fix as in master branch.
Merge pull request #2681 from SkyMarshal/master

XenoArch computer fix for BEF