Revert "Bug 30718: (follow-up) index_records is called more times than we thought"