Fix variable name broken during merge with upstream master