Fix bad backport to stable v3.16+