Bug 840612 - Part 3: refactor the Reset method. r=mayhemer