Wait until i8-fixing starts