Bug 958985 - Fix the variable names (pushed the wrong patch)