Bring in line with retry_ one last time