cherry-pick df8cd0 for reduced waits