Bug 981938 - Part 2: No longer rely on the value of the index record. r=djf