cherry-pick the waittime options