Comment # 8 on bug 59649 from Shawn Starr

This is pending close, waiting til end of week, but so far, the fixes work,
those patches listed in the bug are obsolete as the work is being shifted
around but the logic however seems to fix the reset issues.