Taha and I identified a few possible bugs during AZ. We should try to fix those so we don't have to rely on a timeout.