This is actually a follow to a bug created by the patch from #422438 The changed code was not updated.