Modified version of the fix which just removes all per-record tracking.