Can we come up with a proper wait_for_* for this use-case so we can remove these magic numbers?