Updated for Rust 90ab2f8