Drop the default retry to 5 and make it configurable via a flag