remove workaround for rust-lang/rust#17504