Fix bad backport in 570591de9d865daa499e7a04605c158c03585c52