Bug 1104622 (Part 1) - Remove DiscardTracker. r=tn
Bug 1104622 (Part 2) - Don't discard for redecoding. r=tn