This is somehow out of the scope of this patch, but can you explain why we need such a timeout please?

This feels like we should rely on an external event instead.