Bug 985827 followup.  Remove shadowing variable that confuses things.  r=bustage