add retries in additional cases
Revert "add retries in additional cases"

Pushed straight to master again, I need to stop coding...

This reverts commit fb58236637095e22f25ed17143e435f4a58d7d6c.