Rolled back previous ineffective fix for players with apostrophe in name