Removed run-again-when-fails code smell.