Really fix #17982 this time.
auto merge of #18476 : vadimcn/rust/17982, r=alexcrichton