Restored compatibility with current Rust nightly