Revert "Merge branch 'index-query-offset' into titan05"

This reverts commit d003f2e7fa6503a40dbaf9affe648d9256f071ab, reversing
changes made to ed042299134cd88f466a53f1a43d3e4a08c9084c.

I made this revert on behalf of Matthias.