Fix compilation error after incorrect backport