Removed redundant retry logic, added code to instead re-use the existing retry logic.