Simplify retry handling

Created by  Eelco Dolstra  on June 18, 2015
QJRDO2B4RGTXPSSK2SM6PQ6VEJNOLNMG2EFNMBGNRSEI74KKLVRAC
Change contents