Take out vi_counter usage for retro_return