17 Mach II coming back?