Fixing defibs yet again

Third time's the charm !

- Should fix #1594
- Removed secondary delay. It's not needed anyways