Update for upsteram changes

Rust rev 5ba6102657a892457063d2d6a7cbb9632ce282c6