Auto merge of rust-lang#7649 - flip1995:backport_remerge, r=flip1995

Backport remerge

This is to keep the backported commit in the repository before force pushing the new beta branch.

r? `@ghost`

changelog: none
(literally none)

Author: bors