don't reuse old var remnants

Change-Id: I1074d0431695ec21e22cdef334dbe419763e7ba2