STREAMS-86 | Added back in old number of attempts to try (will change in separate pull request)