Make it work with current nightly Rust 8c66927