The last change left a variable in some situations uninitialized. (cherry picked from commit ca408c15)
mentioned in commit cf65c667