Removing retry logic and adding a timeout