This was initially supposed to be bundled with the changes in the backported commit: 5bf6d77e4ee258c67c2d7ead94cf266a7b9773e7