Bug 25123: (QA follow-up) Re-used variable name