Cherry-picked fix for bad defense against NFS directory propagation delays into v1.64