Improves index lookup performance by one order of magnitude.
Revert "Improves index lookup performance by one order of magnitude."

This reverts commit 025d4504d2cfe9a9a2515c8b4723a97986f9988a.