Revert to no retries by default (#65)
Merge remote-tracking branch 'upstream/master'