This code contains the same bug that the previous commit fixed in `waitForEvent`, namely that we don't clear the timeout if the event is triggered. By using the now fixed `waitForEvent` function we not only deduplicate this code but we also fix this issue so that no incorrect timeout logs show up anymore.