Fix to latest master.

Rust commit: 7503396