Last commit can be merged.

Can you do it only for that one, without the previous ones and the revert? This should be backported at some point and it is good to have only one commit.

—
Reply to this email directly or view it on GitHub.