Patch af18060d521baf86c219d66a26631decb3b28e79.patch has been merged upstream, so it's not required anymore.