Switch to re-using wait_for_sshd