I don't really intend to propose this to 3.30. This is just a handy backport for those who want to test it.