Merge pull request #5815 from BruceForstall/RemoveAmd64Legacy