Revert "More Intel syntax alias fixes."

This reverts commit r186813, which broke the bots.