TOKYO - Japan's Yuzuru Hanyu, who is undergoing treatment for a right-ankle injury, is set to make his competitive comeback in the men's figure skating at February's Pyeongchang Olympics, a Japan Skating Federation official said Sunday.