Remove workaround for rust-lang/rust#16643