Back out 071cfc93d1c7 (bug 931874) to avoid having infinite retries on Try