Update extra166y to keep consistency with mainline.