Prevent infinite loop with var overshadowing Upstream-commit: 6700580bbc92525ac0a848103dca7649d60b4f2f Component: engine