Lance Armstrong makes controversial Tour de France return