Fix to workaround for https://github.com/rust-lang/rust/issues/16935