Update for upstream changes

Rust rev 336349c93207d792587eb0b5258b29da6ec0db8a