remove the looping to workaround the daemon update-wait not always working