This reverts commit 6b52330.

This is unnecessary now that rust-lang/rust#42967
is fixed by rust-lang/rust#43167.

This migth be a fix for #17604