Reverted patch for PR#2095. Addressed by Andy now in x86_64-xlate.pl