acu151452 - Make retry logic consistent.