Avoid all tail-end pipelining on retries